From 109f35f97718bc607db179533461f2805a60a136 Mon Sep 17 00:00:00 2001 From: Mathieu Bornoz Date: Thu, 2 Aug 2012 11:24:52 +0200 Subject: lint + cosmetics --- manifests/server/base.pp | 50 +++++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) (limited to 'manifests/server/base.pp') diff --git a/manifests/server/base.pp b/manifests/server/base.pp index 53cbd70..4e7d645 100644 --- a/manifests/server/base.pp +++ b/manifests/server/base.pp @@ -1,26 +1,24 @@ -/* - -= Class dhcp::server::base -Do NOT include this class - it won't work at all. -Set variables for package name and so on. -This class should be inherited in dhcp::server::$operatingsystem. - -*/ +# = Class dhcp::server::base +# +# Do NOT include this class - it won't work at all. +# Set variables for package name and so on. +# This class should be inherited in dhcp::server::$operatingsystem. +# class dhcp::server::base { include dhcp::params include concat::setup - - package {"dhcp-server": + + package {'dhcp-server': ensure => present, name => $dhcp::params::srv_dhcpd, } - service {"dhcpd": - name => $dhcp::params::srv_dhcpd, + service {'dhcpd': ensure => running, + name => $dhcp::params::srv_dhcpd, enable => true, - require => Package["dhcp-server"], + require => Package['dhcp-server'], } concat {"${dhcp::params::config_dir}/dhcpd.conf": @@ -29,39 +27,39 @@ class dhcp::server::base { mode => '0644', } - concat::fragment {"00.dhcp.server.base": + concat::fragment {'00.dhcp.server.base': ensure => present, target => "${dhcp::params::config_dir}/dhcpd.conf", - require => Package["dhcp-server"], - notify => Service["dhcpd"], + require => Package['dhcp-server'], + notify => Service['dhcpd'], } file {"${dhcp::params::config_dir}/dhcpd.conf.d": - ensure => directory, - mode => 0700, + ensure => directory, + mode => '0700', recurse => true, purge => true, force => true, - source => "puppet:///modules/dhcp/empty" + source => 'puppet:///modules/dhcp/empty' } file {"${dhcp::params::config_dir}/subnets": - ensure => directory, - require => Package["dhcp-server"], - notify => Service["dhcpd"], + ensure => directory, recurse => true, purge => true, force => true, - source => "puppet:///modules/dhcp/empty" + source => 'puppet:///modules/dhcp/empty', + require => Package['dhcp-server'], + notify => Service['dhcpd'], } file {"${dhcp::params::config_dir}/hosts.d": - ensure => directory, - require => Package["dhcp-server"], + ensure => directory, recurse => true, purge => true, force => true, - source => "puppet:///modules/dhcp/empty" + source => 'puppet:///modules/dhcp/empty', + require => Package['dhcp-server'], } } -- cgit v1.2.3