From 142e6607f1e96689f66f93db64947a83e7a43638 Mon Sep 17 00:00:00 2001 From: Marco Bonetti Date: Sat, 3 May 2014 13:56:55 +0200 Subject: [PATCH 1/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f6232a..c093dba 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,6 @@ Quick and dirty provisioning script, will install the following on a bare Debian Usage: - sh -c "`curl https://raw.github.com/cruncher/provision/wheezy/provision.sh`" + sh -c "`curl -L https://raw.github.com/cruncher/provision/wheezy/provision.sh`" From a8cc112fa93abe88a908d1bfd9b6a0c2cf501993 Mon Sep 17 00:00:00 2001 From: Marco Bonetti Date: Sat, 3 May 2014 14:37:09 +0200 Subject: [PATCH 2/6] Update provision.sh --- provision.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provision.sh b/provision.sh index 7d566ce..e602667 100644 --- a/provision.sh +++ b/provision.sh @@ -168,8 +168,8 @@ sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/g' /etc/ssh/sshd /etc/init.d/ssh restart cd -curl -O https://raw.github.com/cruncher/provision/master/user_add.sh -curl -O https://raw.github.com/cruncher/provision/master/duplicity.sh +curl -OL https://raw.github.com/cruncher/provision/master/user_add.sh +curl -OL https://raw.github.com/cruncher/provision/master/duplicity.sh cd mkdir -p .ssh From b9693ab04bfb5ecef31bd0268820045d075b7cd4 Mon Sep 17 00:00:00 2001 From: Marco Bonetti Date: Wed, 4 Jun 2014 10:11:57 +0200 Subject: [PATCH 3/6] Update provision.sh --- provision.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provision.sh b/provision.sh index e602667..e7889fc 100644 --- a/provision.sh +++ b/provision.sh @@ -88,7 +88,7 @@ wget --no-check-certificate https://raw.github.com/Supervisor/initscripts/master sed -i 's/DAEMON=\/usr\/bin/DAEMON=\/usr\/local\/bin/g' debian-norrgard sed -i 's/SUPERVISORCTL=\/usr\/bin/SUPERVISORCTL=\/usr\/local\/bin/g' debian-norrgard sed -i 's/DAEMON_ARGS="--pidfile \${PIDFILE}"/DAEMON_ARGS="--pidfile \${PIDFILE} -c \/etc\/supervisord.conf"/g' debian-norrgard -sed -i 's/# server_names_hash_bucket_size 64/server_names_hash_bucket_size 64/g' +sed -i 's/# server_names_hash_bucket_size 64/server_names_hash_bucket_size 64/g' /etc/nginx/nginx.conf mv debian-norrgard /etc/init.d/supervisord chmod +x /etc/init.d/supervisord update-rc.d supervisord defaults From 6c49ff1e9413a274b6ac1838dedb9279f885f49b Mon Sep 17 00:00:00 2001 From: Marco Bonetti Date: Fri, 18 Jul 2014 12:04:00 +0200 Subject: [PATCH 4/6] Update provision.sh --- provision.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provision.sh b/provision.sh index e7889fc..d7a2869 100644 --- a/provision.sh +++ b/provision.sh @@ -40,7 +40,7 @@ apt-get autoremove -y apt-get purge apt-get -y install nginx postgresql postgresql-client postgresql-contrib libpq-dev postgis postgresql-9.1-postgis gdal-contrib gdal-bin mcelog apt-dater-host -apt-get -y install memcached libjpeg-dev libfreetype6-dev python-dev python-virtualenv python-pip git-core screen zsh vim gettext duplicity ncftp shorewall unzip +apt-get -y install memcached libjpeg-dev libfreetype6-dev python-dev python-virtualenv python-pip git-core screen zsh vim gettext duplicity ncftp shorewall unzip ncurses-dev ln -s /usr/lib/x86_64-linux-gnu/libjpeg.so /usr/lib ln -s /usr/lib/x86_64-linux-gnu/libfreetype.so /usr/lib From 037a97369be2e1522f94a2ce4bdcf8467cb59fa0 Mon Sep 17 00:00:00 2001 From: Marco Bonetti Date: Fri, 19 Dec 2014 11:50:39 +0100 Subject: [PATCH 5/6] make sure curl is installed --- provision.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provision.sh b/provision.sh index d7a2869..f0a87c8 100644 --- a/provision.sh +++ b/provision.sh @@ -5,7 +5,7 @@ DISTRIB=wheezy read -p "update sources.list? (y/n)? " yn if [ "$yn" = "y" ]; then apt-get -y update - apt-get -y install netselect-apt + apt-get -y install netselect-apt c /usr/bin/netselect-apt -n $DISTRIB -o sources.list sed -i 's/# deb http:\/\/security.debian.org/deb http:\/\/security.debian.org/g' sources.list sed -i "s/stable\/updates/$DISTRIB\/updates/g" sources.list From 3c61a44157d41aac259920cc3ddda60dd5b22444 Mon Sep 17 00:00:00 2001 From: Marco Bonetti Date: Fri, 19 Dec 2014 11:51:21 +0100 Subject: [PATCH 6/6] Update provision.sh --- provision.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provision.sh b/provision.sh index f0a87c8..12f0af6 100644 --- a/provision.sh +++ b/provision.sh @@ -5,7 +5,7 @@ DISTRIB=wheezy read -p "update sources.list? (y/n)? " yn if [ "$yn" = "y" ]; then apt-get -y update - apt-get -y install netselect-apt c + apt-get -y install netselect-apt /usr/bin/netselect-apt -n $DISTRIB -o sources.list sed -i 's/# deb http:\/\/security.debian.org/deb http:\/\/security.debian.org/g' sources.list sed -i "s/stable\/updates/$DISTRIB\/updates/g" sources.list @@ -28,7 +28,7 @@ fi apt-get -y update apt-get -y upgrade apt-get -y dist-upgrade -apt-get install -y sudo +apt-get install -y sudo curl echo "Cmnd_Alias PROJECT_CMND = /usr/local/bin/supervisorctl status*, /usr/local/bin/supervisorctl restart*, /etc/init.d/nginx reload*" >> /etc/sudoers echo "# xxx ALL=(root) NOPASSWD: PROJECT_CMND" >> /etc/sudoers