Permalink
Browse files

Testing automatic links feature

  • Loading branch information...
1 parent 262224d commit cbae051f74623616c81e03d9458b0e1bf6b0d033 root committed Mar 18, 2011
View
@@ -19,10 +19,10 @@
host => "${fqdn}",
type => "monitor",
private => "no",
- priority => "10",
+# priority => "10",
# linktags => [ "${role}" , "${stack}" ],
- login => "",
- password => "",
+# login => "",
+# password => "",
tool => "${link_tool}",
enable => "true",
}
@@ -54,7 +54,7 @@
if "${openldap::params::extra}" == "yes" { include openldap::extra }
# Include ldap utils
- include openldap::client
+ # include openldap::client
# Include OS specific subclasses, if necessary
case $operatingsystem {
View
@@ -2,6 +2,8 @@
require psick::params
+ include apache
+
# Main configuration file
file { "psick.conf":
path => "${psick::params::confdir}/psick.conf",
@@ -13,7 +13,7 @@
$workdir = "/var/tmp/psick"
$confdir = "/etc/psick"
- $user = "www-data"
+ $user = "${apache::params::username}"
$outputdir = $operatingsystem ? {
debian => "/var/www/psick",
ubuntu => "/var/www/psick",
@@ -6,10 +6,19 @@ General Variables (how they are passed by the user - BEFORE defaults enforcing):
# General variables that might be used in Example42 infrastructures
$my_project = <%= scope.lookupvar('my_project') %>
+$my_project_onmodule = <%= scope.lookupvar('my_project_onmodule') %>
$site = <%= scope.lookupvar('site') %>
$zone = <%= scope.lookupvar('zone') %>
$type = <%= scope.lookupvar('type') %>
$role = <%= scope.lookupvar('role') %>
+$monitor = <%= scope.lookupvar('monitor') %>
+$monitor_tool = <%= scope.lookupvar('monitor_tool') %>
+$backup = <%= scope.lookupvar('backup') %>
+$backup_tool = <%= scope.lookupvar('backup_tool') %>
+$firewall = <%= scope.lookupvar('firewall') %>
+$firewall_tool = <%= scope.lookupvar('firewall_tool') %>
+$link = <%= scope.lookupvar('link') %>
+$link_tool = <%= scope.lookupvar('link_tool') %>
# General variables that might be set to use Example42 extended modules
$monitor = <%= scope.lookupvar('monitor') %>
@@ -19,10 +19,10 @@
host => "${fqdn}",
type => "monitor",
private => "no",
- priority => "10",
+# priority => "10",
# linktags => [ "$role" , "$stack" ],
- login => "",
- password => "",
+# login => "",
+# password => "",
tool => "${link_tool}",
enable => "true",
}

0 comments on commit cbae051

Please sign in to comment.