adaptions for jessie

Vagrantfile

@@ -8,7 +8,9 @@ VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
  # Every Vagrant virtual environment requires a box to build off of.
- config.vm.box = "boxcutter/debian78-i386"
+ #config.vm.box = "boxcutter/debian78-i386" # wheezy 32bit
+ #config.vm.box = "boxcutter/debian78" # wheezy 64bit
+ config.vm.box = "boxcutter/debian81" # jessie 64bit
 
  config.vm.provider "virtualbox" do |vb|
  # Don't boot with headless mode

bootstrap.sh

@@ -8,24 +8,26 @@ set -x
 MACHINE=$1
 
 # optional: if you have brances in your own repo that should be merged add the repo here (example: 'https://github.com/...')
-FFNORD_TESTING_REPO=''
+FFNORD_TESTING_REPO='https://github.com/rubo77/ffnord-puppet-gateway'
 # and add the branches here (komma separated):
-FFNORD_TESTING_BRANCHES=('')
+FFNORD_TESTING_BRANCHES=('jessie')
 
 SCRIPTPATH="/vagrant"
 MACHINE_PATH="$SCRIPTPATH/machines/${MACHINE}/"
 mkdir -p "$MACHINE_PATH"
 
+LSBDISTCODENAME=jessie
+
 cat > /etc/apt/sources.list << EOF
-deb https://ftp.de.debian.org/debian wheezy main
-deb-src https://ftp.de.debian.org/debian wheezy main
+deb https://ftp.de.debian.org/debian $LSBDISTCODENAME main
+deb-src https://ftp.de.debian.org/debian $LSBDISTCODENAME main
 
-deb https://security.debian.org/ wheezy/updates main contrib
-deb-src https://security.debian.org/ wheezy/updates main contrib
+deb https://security.debian.org/ $LSBDISTCODENAME/updates main contrib
+deb-src https://security.debian.org/ $LSBDISTCODENAME/updates main contrib
 
-# wheezy-updates, previously known as 'volatile'
-deb https://ftp.de.debian.org/debian wheezy-updates main contrib
-deb-src https://ftp.de.debian.org/debian wheezy-updates main contrib
+# $LSBDISTCODENAME-updates, previously known as 'volatile'
+deb https://ftp.de.debian.org/debian $LSBDISTCODENAME-updates main contrib
+deb-src https://ftp.de.debian.org/debian $LSBDISTCODENAME-updates main contrib
 EOF
 
 #Reconfigure apt so that it does not install additional packages
@@ -37,8 +39,14 @@ export DEBIAN_FRONTEND=noninteractive
 # comment this out, if you want to keep manuals, documentation and all locales in your machines
 #source $SCRIPTPATH/minify_debian.sh
 
+# setup locales
+export LANGUAGE=en_US.UTF-8
+export LANG=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+locale-gen en_US.UTF-8
+
 apt-get update
-apt-get install --no-install-recommends -y puppet git tcpdump mtr-tiny
+apt-get install --no-install-recommends -y puppet git tcpdump mtr-tiny apt-transport-https
 # optional apt-get install --no-install-recommends -y vim
 
 puppet module install puppetlabs-stdlib

machines/gc-gw0/manifest.pp

@@ -20,21 +20,23 @@
  fastd_secret => "/root/fastd_secret.conf",
  fastd_port => 11235,
  fastd_peers_git => '/vagrant/fastd/gc/',
+ fastd_verify => 'true',
 
  dhcp_ranges => [ '10.35.0.2 10.35.4.254' ],
  dns_servers => [ '10.35.5.1', '10.35.10.1', '10.35.15.1', '10.35.20.1' ],
 }
 
-ffnord::fastd { "ffgc_old":
- mesh_code => "ffgc",
- mesh_interface => "ffgc-old",
- mesh_mac => "de:ad:be:ef:fd:00",
- vpn_mac => "de:ad:be:ef:fc:00",
- mesh_mtu => 1426,
- fastd_secret => "/root/fastd_secret.conf",
- fastd_port => 10035,
- fastd_peers_git => '/vagrant/fastd/gc/'
-}
+#ffnord::fastd { "ffgc_old":
+# mesh_code => "ffgc",
+# mesh_interface => "ffgc-old",
+# mesh_mac => "de:ad:be:ef:fd:00",
+# vpn_mac => "de:ad:be:ef:fc:00",
+# mesh_mtu => 1426,
+# fastd_secret => "/root/fastd_secret.conf",
+# fastd_port => 10035,
+# fastd_verify => 'true',
+# fastd_peers_git => '/vagrant/fastd/gc/'
+#}
 
 ffnord::icvpn::setup { 'gotham_city0':
  icvpn_as => 65035,