bootstrap script + apt-sources
authorWonko T. Sane <42@wonko.de>
Mon, 14 Mar 2016 16:03:14 +0000 (17:03 +0100)
committerWonko T. Sane <42@wonko.de>
Mon, 14 Mar 2016 16:03:14 +0000 (17:03 +0100)
bootstrap.sh
modules/system/manifests/init.pp

index 9d2e5f2..51e1d2d 100755 (executable)
@@ -9,20 +9,30 @@ if [ "$1" != "RUNME" ]; then
     wget "${GITPROJ}/raw/master/bootstrap.sh" -O /root/bootstrap.sh
     chmod u+x /root/bootstrap.sh
     exec /root/bootstrap.sh RUNME
+    exit
 fi
 
+#check for install.hqs
+if ping -c 5 instal.hq; then
+    echo 'Acquire::http::Proxy "http://install.hq:8080/";' > /etc/apt/apt.conf
+else
+    echo "#no proxy" > /etc/apt/apt.conf
+fi
 
+apt update
+apt install git puppet vim
+apt full-upgrade
 
-echo yayyay
-
-
-exit
 
-mv /etc/puppet /etc/puppet.orig
+if [ ! -e /etc/puppet/.git ]; then  
+    mv /etc/puppet /etc/puppet.orig
+    git clone ${GITPROJ}.git /etc/puppet
+fi
 
-git clone https://chaos.expert/ccc-ffm/4Refugees-InternetCafe.git /etc/puppet
 
 cd /etc/puppet
+git pull
 git submodule init
 git submodule update
+git pull
 puppet apply /etc/puppet/manifests/site.pp
index 1600af3..694ac1e 100644 (file)
@@ -14,7 +14,7 @@ class system {
                                repos => 'main non-free contrib',
                        },
                        'debian-security' => {
-                               location => 'http://security.debian.org/debian-security/',
+                               location => 'http://security.debian.org/',
                                release => "${lsbdistcodename}/updates",
                                repos => 'main non-free contrib',
                        },