Some simplification

diff --git a/share/hydra/deploy b/share/hydra/deploy
index e4610288f4d01b90115d2294ad90d12b7310847a..efbaebaeb2c7277aa19332a1867d11fd038b2eb0 100755 (executable)
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -54,8 +54,8 @@ for node in $NODES; do
     # Check if puppet is installed
     if [ ! -e "$FOLDER/usr/bin/puppet" ]; then
       echo "Installing dependencies..."
-      $DEPLOY_COMMAND aptitude update
-      $DEPLOY_COMMAND aptitude install $DEPLOY_DEPENDENCIES -y
+      $DEPLOY_COMMAND apt-get update
+      $DEPLOY_COMMAND apt-get install $DEPLOY_DEPENDENCIES -y
     fi
 
     # Create folders
@@ -79,8 +79,8 @@ for node in $NODES; do
 
     # Check if puppet is installed
     if [ ! -e "/usr/bin/puppet" ]; then
-      $SUDO aptitude update
-      $SUDO aptitude install $DEPLOY_DEPENDENCIES -y
+      $SUDO apt-get update
+      $SUDO apt-get install $DEPLOY_DEPENDENCIES -y
     fi
 
     # Run puppet
@@ -97,8 +97,8 @@ for node in $NODES; do
     ##### BEGIN REMOTE SCRIPT #####
     if ! which puppet &> /dev/null; then
       echo "Installing dependencies..."
-      sudo aptitude update
-      sudo aptitude install $DEPLOY_DEPENDENCIES -y
+      sudo apt-get update
+      sudo apt-get install $DEPLOY_DEPENDENCIES -y
     fi
     ##### END REMOTE SCRIPT #######
 EOF

diff --git a/share/hydra/install b/share/hydra/install
index 91a1226bb50ed5542146d1bdd1572c49a527e5ad..6a3c07f3a77aa30625d78dc28a8372f3b44aa846 100755 (executable)
--- a/share/hydra/install
+++ b/share/hydra/install
@@ -50,8 +50,8 @@ for node in $NODES; do
   ##### BEGIN REMOTE SCRIPT #####
   if ! which git &> /dev/null; then
     echo "Installing git..."
-    sudo aptitude update
-    sudo aptitude install git-core -y
+    sudo apt-get update
+    sudo apt-get install git-core -y
   fi
 
   # Git version

diff --git a/share/hydra/mass b/share/hydra/mass
index 3b1ed2de350f0454e530e5edb4af12e26d7ab000..928836fed66d9703d9547d7e7cf4d5b8184d7c4f 100755 (executable)
--- a/share/hydra/mass
+++ b/share/hydra/mass
@@ -62,7 +62,7 @@ set_nodes
 
 # Validation
 if [ "$BASENAME" == "mass-update" ]; then
-  COMMAND="aptitude update"
+  COMMAND="apt-get update"
 elif [ "$BASENAME" == "mass-upgrade" ]; then
   COMMAND="DEBIAN_FRONTEND=noninteractive hydractl upgrade clean"
 elif [ "$BASENAME" == "mass-web" ]; then

diff --git a/share/hydractl/install b/share/hydractl/install
index 0f43b4f5ef89b05a510cd4d392501db14fe2655d..baae1768f010a23aa36e28969d08b0ac79f278a4 100755 (executable)
--- a/share/hydractl/install
+++ b/share/hydractl/install
@@ -35,8 +35,8 @@ echo "Installing to local node..."
 
 if ! which git &> /dev/null; then
   echo "Installing git..."
-  $sudo aptitude update
-  $sudo aptitude install git-core -y
+  $sudo apt-get update
+  $sudo apt-get install git-core -y
 fi
 
 # Git version

diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index ec3c5c361501f28a820305fc52b28c81d4a082c7..ab32bf727640c4cba47b9802b5047b883a2f980b 100755 (executable)
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -129,23 +129,16 @@ function hydra_system_upgrade_upgrade {
 
 # Cleanup procedures
 function hydra_system_upgrade_cleanup {
-  apt-get autoremove -y
+  apt-get autoremove -y --purge
   apt-get clean
   hydra_system_upgrade_stage custom
 }
 
 # Custom upgrade procedures
 function hydra_system_upgrade_custom {
-  if [ "$nextrelease" == "wheezy" ]; then
-    # Old suhosin config
-    rm -f /etc/php5/conf.d/suhosin.ini
-
-    # This has to be manually installed again
-    if [ -f "/etc/php5/cli/conf.d/uploadprogress.ini" ]; then
-      pecl uninstall uploadprogress
-      pecl install   uploadprogress
-    fi
-  fi
+  #if [ "$nextrelease" == "jessie" ]; then
+  #  # Do your custom jessie stuff here
+  #fi
 
   hydractl trac-upgrade
   hydra_system_upgrade_stage puppet

diff --git a/share/hydractl/upgrade b/share/hydractl/upgrade
index e3c1141832b45d2137d39caa0f59d2a28ac238d8..a4d991740ae8f3ae0dd15ef823346b08e6f32af3 100755 (executable)
--- a/share/hydractl/upgrade
+++ b/share/hydractl/upgrade
@@ -26,8 +26,8 @@ fi
 
 # Issue upgrade
 if ! $sudo lsof /var/lib/dpkg/lock &> /dev/null; then
-  $sudo aptitude update
-  $sudo aptitude full-upgrade -y
+  $sudo apt-get update
+  $sudo apt-get full-upgrade -y
 else
   echo "Apt is locked, aborting."
 fi
@@ -40,5 +40,5 @@ hydractl pbuilder-upgrade
 
 # Cleanup
 if [ "$CLEAN" == "clean" ]; then
-  $sudo aptitude clean
+  $sudo apt-get clean
 fi