From: František Dvořák <valtri@civ.zcu.cz>
Date: Sat, 8 Mar 2014 19:23:39 +0000 (+0100)
Subject: Update installation HOWTO.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=4ed221149dc502d7b3c267163cdd176b79e94cf6;p=rOCCI-packaging.git

Update installation HOWTO.
---

diff --git a/HOWTO.sh b/HOWTO.sh
index ba24e4f..7520efb 100644
--- a/HOWTO.sh
+++ b/HOWTO.sh
@@ -1,5 +1,6 @@
 #! /bin/sh -xe
 
+# wheezy
 apt-key adv --fetch-keys http://scientific.zcu.cz/repos/jenkins-builder.asc
 apt-key adv --fetch-keys http://scientific.zcu.cz/repos/valtri2.asc
 cat << EOF > /etc/apt/sources.list.d/rocci-wheezy.list
@@ -7,12 +8,16 @@ deb http://scientific.zcu.cz/repos/rOCCI/debian/ wheezy/
 deb-src http://scientific.zcu.cz/repos/rOCCI/debian/ wheezy/
 EOF
 
-apt-get update
-apt-get install -y apache2-mpm-worker libapache2-mod-passenger
-apt-get install -y rocci-server
+if test -n "$FRESH_PASSENGER"; then
+  # squeeze, wheezy
+  # lucid, precise, raring, saucy
+  apt-get install -y apt-transport-https
+  apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 561F9B9CAC40B2F7
+  cat <<EOF > /etc/apt/sources.list.d/passenger-wheezy.list
+deb https://oss-binaries.phusionpassenger.com/apt/passenger wheezy main
+deb-src https://oss-binaries.phusionpassenger.com/apt/passenger wheezy main
+EOF
+fi
 
-# if rocci-server is set-up before apache, these steps must be performed
-# manually:
-a2enmod ssl
-a2ensite occi-ssl
-service apache2 reload
+apt-get update
+apt-get install -y rocci-server-apache