From 8102574b110ecf73ffa82d747cfde9a22f5a9707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Sch=C3=BCtte?= <martin.schuette@deck36.de>
Date: Mon, 19 May 2014 20:08:15 +0200
Subject: [PATCH] move apt repos from ff_gw::apt to ff_gw::sysadmin

---
 manifests/init.pp     | 22 ----------------------
 manifests/sysadmin.pp | 24 +++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index df7b226..7e86325 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,6 +1,4 @@
 class ff_gw($ff_net, $ff_mesh_net, $ff_as, $mesh_mac, $gw_ipv4, $gw_ipv6, $secret_key, $vpn_ca_crt, $vpn_usr_crt, $vpn_usr_key, $dhcprange_start, $dhcprange_end, $gw_do_ic_peering = false) {
-  class { 'ff_gw::apt': }
-  ->
   class { 'ff_gw::software': }
   ->
   class { 'ff_gw::fastd':
@@ -40,26 +38,6 @@ class ff_gw($ff_net, $ff_mesh_net, $ff_as, $mesh_mac, $gw_ipv4, $gw_ipv6, $secre
   }
 }
 
-class ff_gw::apt() {
-  class { '::apt':
-    always_apt_update => true
-  }
-  # batman repo
-  apt::source { 'universe-factory':
-    location   => 'http://repo.universe-factory.net/debian/',
-    release    => 'sid',
-    repos      => 'main',
-    key        => '16EF3F64CB201D9C',
-    key_server => 'pool.sks-keyservers.net',
-  }
-  # bird repo
-  apt::source { 'bird-network':
-    location   => 'http://bird.network.cz/debian/',
-    release    => 'wheezy',
-    repos      => 'main',
-  }
-}
-
 class ff_gw::software {
   package {
     'batctl':
diff --git a/manifests/sysadmin.pp b/manifests/sysadmin.pp
index 2983041..84a2b7c 100644
--- a/manifests/sysadmin.pp
+++ b/manifests/sysadmin.pp
@@ -1,5 +1,7 @@
 # kitchen sink class for various small settings
 class ff_gw::sysadmin($zabbixserver = '127.0.0.1', $muninserver = '127.0.0.1', $sethostname = false, $setip = false, $accounts = {}) {
+
+  # first of all: fix my hostname
   if $sethostname and $setip {
     # set system hostname
     class { 'ff_gw::sysadmin::hostname':
@@ -8,13 +10,33 @@ class ff_gw::sysadmin($zabbixserver = '127.0.0.1', $muninserver = '127.0.0.1', $
     }
   }
 
+  # next important thing: set up apt repositories
+  #
+  class { '::apt':
+    always_apt_update => true
+  }
   # use backports repo
   apt::source { 'wheezy-backports':
     location => 'http://ftp.de.debian.org/debian/',
     release  => 'wheezy-backports',
     repos    => 'main',
   }
-  # some more packages
+  # batman repo
+  apt::source { 'universe-factory':
+    location   => 'http://repo.universe-factory.net/debian/',
+    release    => 'sid',
+    repos      => 'main',
+    key        => '16EF3F64CB201D9C',
+    key_server => 'pool.sks-keyservers.net',
+  }
+  # bird repo // TODO: no PGP key
+  apt::source { 'bird-network':
+    location   => 'http://bird.network.cz/debian/',
+    release    => 'wheezy',
+    repos      => 'main',
+  }
+
+  # then install some basic packages
   package {
     ['vim-nox', 'git', 'etckeeper', 'pv', 'curl', 'atop',
     'screen', 'tcpdump', 'rsync', 'file']: