From ab9a292f41139c5c5e36de87e03236e29dd27e23 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 31 Jan 2013 11:09:20 +0100
Subject: puppet tags: site_config::default and site_config::slow

---
 puppet/modules/site_config/manifests/default.pp    | 28 +++++++++++++++++++++
 puppet/modules/site_config/manifests/hosts.pp      |  2 +-
 puppet/modules/site_config/manifests/init.pp       | 29 ----------------------
 puppet/modules/site_config/manifests/resolvconf.pp |  2 +-
 puppet/modules/site_config/manifests/slow.pp       |  6 +++++
 5 files changed, 36 insertions(+), 31 deletions(-)
 create mode 100644 puppet/modules/site_config/manifests/default.pp
 delete mode 100644 puppet/modules/site_config/manifests/init.pp
 create mode 100644 puppet/modules/site_config/manifests/slow.pp

(limited to 'puppet/modules/site_config')

diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
new file mode 100644
index 00000000..0605604b
--- /dev/null
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -0,0 +1,28 @@
+class site_config::default {
+  tag 'default'
+
+  $domain_hash = hiera('domain')
+
+  # default class, used by all hosts
+
+  include lsb, git
+
+  # configure apt
+  include site_apt
+
+
+  # configure ssh and include ssh-keys
+  include site_config::sshd
+
+  # configure /etc/resolv.conf
+  include site_config::resolvconf
+
+  # configure caching, local resolver
+  include site_config::caching_resolver
+
+  # configure /etc/hosts
+  class { 'site_config::hosts':
+    stage => initial,
+  }
+
+}
diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp
index a5f1b105..6c00f3b6 100644
--- a/puppet/modules/site_config/manifests/hosts.pp
+++ b/puppet/modules/site_config/manifests/hosts.pp
@@ -3,7 +3,7 @@ class site_config::hosts() {
   $hosts = hiera('hosts','')
   $hostname = hiera('name')
 
-  $domain_public = $site_config::domain_hash['full_suffix']
+  $domain_public = $site_config::default::domain_hash['full_suffix']
 
   file { "/etc/hostname":
     ensure => present,
diff --git a/puppet/modules/site_config/manifests/init.pp b/puppet/modules/site_config/manifests/init.pp
deleted file mode 100644
index f0ce9856..00000000
--- a/puppet/modules/site_config/manifests/init.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-class site_config {
-  $domain_hash = hiera('domain')
-
-  # default class, used by all hosts
-
-  include lsb, git
-
-  # configure apt
-  include site_apt
-
-
-  # configure ssh and include ssh-keys
-  include site_config::sshd
-
-  # configure /etc/resolv.conf
-  include site_config::resolvconf
-
-  # configure caching, local resolver
-  include site_config::caching_resolver
-
-  # configure /etc/hosts
-  class { 'site_config::hosts':
-    stage => initial,
-  }
-
-  class { 'site_apt::dist_upgrade':
-    stage => initial,
-  }
-}
diff --git a/puppet/modules/site_config/manifests/resolvconf.pp b/puppet/modules/site_config/manifests/resolvconf.pp
index b803f17e..d73f0b78 100644
--- a/puppet/modules/site_config/manifests/resolvconf.pp
+++ b/puppet/modules/site_config/manifests/resolvconf.pp
@@ -11,7 +11,7 @@ class site_config::resolvconf {
     ensure => absent;
   }
 
-  $domain_public = $site_config::domain_hash['full_suffix']
+  $domain_public = $site_config::default::domain_hash['full_suffix']
 
   # 127.0.0.1:      caching-only local bind
   # 87.118.100.175: http://server.privacyfoundation.de
diff --git a/puppet/modules/site_config/manifests/slow.pp b/puppet/modules/site_config/manifests/slow.pp
new file mode 100644
index 00000000..a4a9f19f
--- /dev/null
+++ b/puppet/modules/site_config/manifests/slow.pp
@@ -0,0 +1,6 @@
+class site_config::slow {
+
+  class { 'site_apt::dist_upgrade':
+    stage => initial,
+  }
+}
-- 
cgit v1.2.3


From 42aef6df0091f8879d83860efd3c08a6d8e26bdf Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 31 Jan 2013 11:42:58 +0100
Subject: changed tag default to 'base'

---
 puppet/modules/site_config/manifests/default.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/site_config')

diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp
index 0605604b..577970ca 100644
--- a/puppet/modules/site_config/manifests/default.pp
+++ b/puppet/modules/site_config/manifests/default.pp
@@ -1,5 +1,5 @@
 class site_config::default {
-  tag 'default'
+  tag 'base'
 
   $domain_hash = hiera('domain')
 
-- 
cgit v1.2.3