file_line teilweise entfernt

manifests/changetrack.pp

@@ -11,17 +11,19 @@ class ubuntu_server::changetrack($changetrack_cfg='puppet:///modules/ubuntu_serv
         ensure => present,
     }
 
-    file_line{'changetrack_config_1':
-        path    => '/etc/default/changetrack',
-        line    => 'AUTO_TRACK_ALL_CONFFILES=yes',
-        match   => '^AUTO_TRACK_ALL_CONFFILES',
+    exec{'changetrack_config_1':
+        path    => $::path,
+        command => "sed -i '/^AUTO_TRACK_ALL_CONFFILES=/{h;s/.*/AUTO_TRACK_ALL_CONFFILES=yes/};${x;/^$/{s//AUTO_TRACK_ALL_CONFFILES=yes/;H};x}' /etc/default/changetrack",
+        unless  => "grep -q -E '^AUTO_TRACK_ALL_CONFFILES=yes$' /etc/default/changetrack",
         require => Package['changetrack'],
     }
 
     file{'changetrack_cfg':
-        ensure  => file,
-        path    => '/etc/changetrack.conf',
-        source  => $changetrack_cfg,
-        require => Package['changetrack'],
+        ensure   => file,
+        path     => '/etc/changetrack.conf',
+        source   => $changetrack_cfg,
+        replace  => true,
+        multiple => true,
+        require  => Package['changetrack'],
     }
 }

manifests/grub.pp

@@ -9,18 +9,18 @@ class ubuntu_server::grub{
     } ~> Exec['update-grub']
 
     if $::productname != 'OpenStack Nova' {
-        file_line{'grub_config_2':
-            path  => '/etc/default/grub',
-            line  => 'GRUB_TERMINAL=console',
-            match => '^.*GRUB_TERMINAL',
+        exec{'grub_config_2':
+            path    => $::path,
+            command => "sed -i '/^GRUB_TERMINAL=/{h;s/.*/GRUB_TERMINAL=console/};${x;/^$/{s//GRUB_TERMINAL=console/;H};x}' /etc/default/grub",
+            unless  => "grep -q -E '^GRUB_TERMINAL=console$' /etc/default/grub",
         } ~> Exec['update-grub']
     }
 
     if $::virtual == 'vmware' {
-        file_line{'grub_config_3':
-            path  => '/etc/default/grub',
-            line  => 'GRUB_CMDLINE_LINUX="elevator=noop"',
-            match => '^GRUB_CMDLINE_LINUX=',
+        exec{'grub_config_3':
+            path    => $::path,
+            command => "sed -i '/^GRUB_CMDLINE_LINUX=/{h;s/.*/GRUB_CMDLINE_LINUX=\"elevator=noop\"/};${x;/^$/{s//GRUB_CMDLINE_LINUX=\"elevator=noop\"/;H};x}' /etc/default/grub",
+            unless  => "grep -q -E '^GRUB_CMDLINE_LINUX=\"elevator=noop\"$' /etc/default/grub",
         } ~> Exec['update-grub']
     }
     elsif $::productname == 'OpenStack Nova' {
@@ -31,24 +31,22 @@ class ubuntu_server::grub{
         } ~> Exec['update-grub']
     }
 
-    file_line{'grub_config_4':
-        path  => '/etc/default/grub',
-        line  => 'GRUB_TIMEOUT=15',
-        match => '^GRUB_TIMEOUT=',
+    exec{'grub_config_4':
+        path    => $::path,
+        command => "sed -i '/^GRUB_TIMEOUT=/{h;s/.*/GRUB_TIMEOUT=15/};${x;/^$/{s//GRUB_TIMEOUT=15/;H};x}' /etc/default/grub",
+        unless  => "grep -q -E '^GRUB_TIMEOUT=15$' /etc/default/grub",
     } ~> Exec['update-grub']
 
-    file_line{'grub_config_5':
-        path  => '/etc/default/grub',
-        line  => 'GRUB_TIMEOUT_STYLE=countdown',
-        match => '^GRUB_HIDDEN_TIMEOUT=',
+    exec{'grub_config_5':
+        path    => $::path,
+        command => "sed -i '/^GRUB_TIMEOUT_STYLE=/{h;s/.*/GRUB_TIMEOUT_STYLE=countdown/};${x;/^$/{s//GRUB_TIMEOUT_STYLE=countdown/;H};x}' /etc/default/grub",
+        unless  => "grep -q -E '^GRUB_TIMEOUT_STYLE=countdown$' /etc/default/grub",
     } ~> Exec['update-grub']
 
-    file_line{'grub_config_6':
-        ensure            => absent,
-        path              => '/etc/default/grub',
-        line              => 'GRUB_HIDDEN_TIMEOUT_QUIET',
-        match             => '^GRUB_HIDDEN_TIMEOUT_QUIET=',
-        match_for_absence => true,
+    exec{'grub_config_6':
+        path    => $::path,
+        command => "sed -i '/^GRUB_HIDDEN_TIMEOUT_QUIET=/s/\(.*\)/#\1/' /etc/default/grub",
+        onlyif  => "grep -q -E '^GRUB_TIMEOUT_STYLE=' /etc/default/grub",
     } ~> Exec['update-grub']
 
     exec{'update-grub':

manifests/nrpe.pp

@@ -41,24 +41,24 @@ class ubuntu_server::nrpe($nrpe_local_cfg='puppet:///modules/ubuntu_server/etc/n
     } ~> Service['nagios-nrpe-server']
 
     if $enable_sudo_docker == true {
-        file_line{'sudoers_1':
-            path  => '/etc/sudoers',
-            line  => 'nagios ALL=(ALL:ALL) NOPASSWD: /opt/nagios/check_docker_container',
-            match => '^nagios ALL=(ALL:ALL) NOPASSWD: /opt/nagios/check_docker_container',
+        exec{'sudoers_1':
+            path    => $::path,
+            command => "sed -i '/^nagios ALL=(ALL:ALL) NOPASSWD: \/opt\/nagios\/check_docker_container/{h;s/.*/nagios ALL=(ALL:ALL) NOPASSWD: \/opt\/nagios\/check_docker_container/};${x;/^$/{s//nagios ALL=(ALL:ALL) NOPASSWD: \/opt\/nagios\/check_docker_container/;H};x}' /etc/sudoers",
+            unless  => "grep -q -E '^nagios ALL=(ALL:ALL) NOPASSWD: /opt/nagios/check_docker_container$' /etc/sudoers",
         }
     }
 
     if $enable_puppet_report == true {
-        file_line{'puppet_report_1':
-            path  => '/etc/sudoers',
-            line  => 'nagios ALL=(root) NOPASSWD: /opt/nagios/check_puppet_report',
-            match => '^nagios ALL=(root) NOPASSWD: /opt/nagios/check_puppet_report',
+        exec{'puppet_report_1':
+            path    => $::path,
+            command => "sed -i '/^nagios ALL=(root) NOPASSWD: \/opt\/nagios\/check_puppet_report/{h;s/.*/nagios ALL=(root) NOPASSWD: \/opt\/nagios\/check_puppet_report/};${x;/^$/{s//nagios ALL=(root) NOPASSWD: /opt/nagios/check_puppet_report;H};x}' /etc/sudoers",
+            unless  => "grep -q -E '^nagios ALL=(root) NOPASSWD: /opt/nagios/check_puppet_report$' /etc/sudoers",
         }
 
-        file_line{'puppet_report_2':
-            path  => '/etc/sudoers',
-            line  => 'Defaults: nagios !requiretty',
-            match => '^Defaults: nagios !requiretty',
+        exec{'puppet_report_2':
+            path    => $::path,
+            command => "sed -i '/^Defaults: nagios /{h;s/.*/Defaults: nagios !requiretty/};${x;/^$/{s//Defaults: nagios !requiretty;H};x}' /etc/sudoers",
+            unless  => "grep -q -E '^Defaults: nagios !requiretty$' /etc/sudoers",
         }
     }
 }