From 997ab7fb2303da86ee27cb781ba6b74d4a2e89a6 Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 23 Apr 2013 16:27:43 +0200 Subject: no need to import common anymore --- puppet/manifests/site.pp | 1 - 1 file changed, 1 deletion(-) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 08cbbb9e..327b6a67 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -11,7 +11,6 @@ Package { require => Exec['apt_updated'] } include stdlib -import 'common' include site_config::default include site_config::slow -- cgit v1.2.3 From 0f95eccb08b80c02db99d57da413025813766d5e Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 9 Jul 2013 17:26:06 +0200 Subject: re-add mx service --- puppet/manifests/site.pp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 327b6a67..a340ce66 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -36,3 +36,7 @@ if $services =~ /\bmonitor\b/ { if $services =~ /\btor\b/ { include site_tor } + +if $services =~ /\bmx\b/ { + include site_mx +} -- cgit v1.2.3 From 56773db9cd0adab580e05e041b674a709a81a1db Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 7 Mar 2013 15:24:29 +0100 Subject: include site_mx --- puppet/manifests/site.pp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 08cbbb9e..2ceca4f1 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -37,3 +37,8 @@ if $services =~ /\bmonitor\b/ { if $services =~ /\btor\b/ { include site_tor } + +if 'webapp' in $services { + include site_webapp +} + -- cgit v1.2.3 From b8fcdf50b284aa88ff3886243299ce76c9acd3eb Mon Sep 17 00:00:00 2001 From: varac Date: Tue, 23 Apr 2013 16:27:43 +0200 Subject: no need to import common anymore --- puppet/manifests/site.pp | 1 - 1 file changed, 1 deletion(-) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 2ceca4f1..1603176c 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -11,7 +11,6 @@ Package { require => Exec['apt_updated'] } include stdlib -import 'common' include site_config::default include site_config::slow -- cgit v1.2.3 From 1c9c5a5fec51919a8e9ec14f5fe9b16c538bb4fa Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 21 May 2013 17:35:20 -0400 Subject: initial soledad configuration Change-Id: I19e91887c3f8e90764b4baef8c5e29e25658e190 --- puppet/manifests/site.pp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'puppet/manifests/site.pp') diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 08cbbb9e..bdb57c83 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -30,6 +30,10 @@ if $services =~ /\bwebapp\b/ { include site_nickserver } +if $services =~ /\bsoledad\b/ { + include soledad::server +} + if $services =~ /\bmonitor\b/ { include site_nagios } -- cgit v1.2.3