diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-19 16:36:51 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-19 16:36:51 -0200 |
| commit | 80646217d98031421a847613c16c0a1f85dc63bd (patch) | |
| tree | 9bcb65500f3acbb9c9d74ab62e613faf4b3550ea | |
| parent | 5b116619d0ceb91c56fa032d20af0549b9dc2be1 (diff) | |
| download | puppet-syslog-ng-80646217d98031421a847613c16c0a1f85dc63bd.tar.gz puppet-syslog-ng-80646217d98031421a847613c16c0a1f85dc63bd.tar.bz2 | |
Upgrading for 2.7 compatibility --config
| -rw-r--r-- | manifests/init.pp | 9 | ||||
| -rw-r--r-- | manifests/vserver.pp | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 30638a1..1406d12 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -16,12 +16,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -import "vserver.pp" - -# whether to log kernel messages -$log_kernel_msgs = true - -class syslog-ng { +class syslog-ng( + $log_kernel_msgs = true +) { # the needed packages package { "syslog-ng": ensure => installed, } diff --git a/manifests/vserver.pp b/manifests/vserver.pp index baf368a..0c1e344 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -1,8 +1,9 @@ class syslog-ng::vserver { # syslog-ng class for vservers # where is not possible to log kernel msgs - $log_kernel_msgs = false - include syslog-ng + class { 'syslog-ng': + log_kernel_msgs => false, + } # Manage this file due to # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625488 @@ -12,7 +13,7 @@ class syslog-ng::vserver { group => "root", mode => 0644, ensure => present, - source => "puppet://$server/modules/syslog-ng/logrotate", + source => "puppet:///modules/syslog-ng/logrotate", } # Manage this file due to @@ -23,7 +24,7 @@ class syslog-ng::vserver { group => "root", mode => 0644, ensure => present, - source => "puppet://$server/modules/syslog-ng/default", + source => "puppet:///modules/syslog-ng/default", notify => Service["syslog-ng"], } } |