aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-02-08 02:21:45 -0200
committerSilvio Rhatto <rhatto@riseup.net>2016-02-08 02:21:45 -0200
commit032b6e5ec2c34f992b4d8a344ef460db4e9369d2 (patch)
treec81e17e355bfaa94d54dda1ff5dca3eba488eb41
parentc47d2e7762e8f2ac77efcee5b65ccc794f2c1f25 (diff)
downloadhydra-032b6e5ec2c34f992b4d8a344ef460db4e9369d2.tar.gz
hydra-032b6e5ec2c34f992b4d8a344ef460db4e9369d2.tar.bz2
Some simplification
-rwxr-xr-xshare/hydra/deploy12
-rwxr-xr-xshare/hydra/install4
-rwxr-xr-xshare/hydra/mass2
-rwxr-xr-xshare/hydractl/install4
-rwxr-xr-xshare/hydractl/system-upgrade15
-rwxr-xr-xshare/hydractl/upgrade6
6 files changed, 18 insertions, 25 deletions
diff --git a/share/hydra/deploy b/share/hydra/deploy
index e461028..efbaeba 100755
--- 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 91a1226..6a3c07f 100755
--- 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 3b1ed2d..928836f 100755
--- 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 0f43b4f..baae176 100755
--- 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 ec3c5c3..ab32bf7 100755
--- 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 e3c1141..a4d9917 100755
--- 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