diff options
author | mh <mh@immerda.ch> | 2013-01-02 17:51:29 +0100 |
---|---|---|
committer | mh <mh@immerda.ch> | 2013-01-02 17:51:29 +0100 |
commit | 2b2268702938453bcece9ebe6070c03929910f8a (patch) | |
tree | f7ddfdfaf2430b19dcb7f89b3c16ccf4321976de /manifests/defaults/templates.pp | |
parent | df358dcf15d26ba59b59f686ceee4b07b3aed7dd (diff) | |
parent | a2a80093d42b7e9eec9d2af3c66138f7ceaf9ed6 (diff) |
Merge remote-tracking branch 'riseup/master' into HEAD
Conflicts:
manifests/apache.pp
manifests/base.pp
manifests/defaults/templates.pp
manifests/defaults/vars.pp
manifests/init.pp
manifests/irc_bot.pp
manifests/nsca/client.pp
manifests/nsca/server.pp
manifests/service.pp
manifests/service/mysql.pp
templates/irc_bot/nsa.cfg.erb
Diffstat (limited to 'manifests/defaults/templates.pp')
-rw-r--r-- | manifests/defaults/templates.pp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp index 0e73c97..9711dd4 100644 --- a/manifests/defaults/templates.pp +++ b/manifests/defaults/templates.pp @@ -11,5 +11,4 @@ class nagios::defaults::templates { notify => Service['nagios'], mode => 0644, owner => root, group => root; } - } |