From b7277a8c666248a2a134f1d5b84c994df9904b7c Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 4 Oct 2012 22:34:20 +0200
Subject: moved most includes to site_config

---
 puppet/manifests/site.pp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'puppet/manifests')

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 3ae9ebea..89c97888 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,22 +1,16 @@
 node 'default' {
+  # prerequisites
+  import 'common'
+  include concat::setup
 
   # include some basic classes
-  # $concat_basedir =  '/var/lib/puppet/modules/concat'  # do we need this ?
-  include concat::setup
-  include apt, lsb, git
-  import 'common'
+  #include site_config
 
+  # parse services for host
   $services=hiera_array('services')
   notice("Services for $fqdn: $services")
 
-  # configure ssh and inculde ssh-keys
-  #include sshd
-  $ssh_keys=hiera_hash('ssh_keys')
-  include site_sshd
-  notice($ssh_keys)
-  create_resources('site_sshd::ssh_key', $ssh_keys)
-
-
+  # configure eip
   if 'eip' in $services {
     include site_config::eip
   }
-- 
cgit v1.2.3


From 9fc9b19057fcf322e8d3fcaead0032859f873f53 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 11 Oct 2012 19:49:48 +0200
Subject: renamed hiera keys to work with leap_cli

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

(limited to 'puppet/manifests')

diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index 89c97888..d451bdf5 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -11,7 +11,7 @@ node 'default' {
   notice("Services for $fqdn: $services")
 
   # configure eip
-  if 'eip' in $services {
+  if 'openvpn' in $services {
     include site_config::eip
   }
 
-- 
cgit v1.2.3