| OLD | NEW | 
|---|
| 1 class sitescripts ( | 1 class sitescripts ( | 
| 2     $sitescriptsini_source = '', | 2     $sitescriptsini_source = '', | 
| 3     $sitescriptsini_content = '', | 3     $sitescriptsini_content = '', | 
| 4   ){ | 4   ){ | 
| 5 | 5 | 
| 6   @concat {'/etc/sitescripts.ini': | 6   @concat {'/etc/sitescripts.ini': | 
| 7     mode => 644, | 7     mode => 644, | 
| 8     owner => root, | 8     owner => root, | 
| 9     group => root, | 9     group => root, | 
| 10   } | 10   } | 
| 11 | 11 | 
| 12   define configfragment($content = '', $source = '') { | 12   define configfragment($content = '', $source = '') { | 
| 13 | 13 | 
| 14     realize(Concat['/etc/sitescripts.ini']) | 14     realize(Concat['/etc/sitescripts.ini']) | 
| 15 | 15 | 
| 16     concat::fragment {"/etc/sitescripts.ini#$title": | 16     concat::fragment {"/etc/sitescripts.ini#$title": | 
| 17       target  => '/etc/sitescripts.ini', | 17       target  => '/etc/sitescripts.ini', | 
| 18       content => $content, | 18       content => $content, | 
| 19       source  => "$source$content" ? { | 19       source  => "$source$content" ? { | 
| 20         ''     => $title, | 20         ''     => $title, | 
| 21         default => $source, | 21         default => $source, | 
| 22       } | 22       } | 
| 23     } | 23     } | 
| 24   } | 24   } | 
| 25 | 25 | 
| 26   if ($sitescriptsini_source != '') or ($sitescriptsini_content != '') { | 26   if ($sitescriptsini_source != '') or ($sitescriptsini_content != '') { | 
| 27 | 27 | 
| 28     $content = $sitescriptsini_content | 28     configfragment {'/etc/sitescripts.ini': | 
| 29     $source = $sitescriptsini_source | 29       content => $sitescriptsini_content, | 
| 30   } | 30       source => $sitescriptsini_source, | 
| 31   else { | 31     } | 
| 32 |  | 
| 33     $content = "# Puppet: Class['$title']\n" |  | 
| 34     $source = '' |  | 
| 35   } |  | 
| 36 |  | 
| 37   configfragment {'/etc/sitescripts.ini': |  | 
| 38     content => $content, |  | 
| 39     source => $source, |  | 
| 40   } | 32   } | 
| 41 | 33 | 
| 42   $configfragments = hiera('sitescripts::configfragments', {}) | 34   $configfragments = hiera('sitescripts::configfragments', {}) | 
| 43   create_resources('sitescripts::configfragment', $configfragments) | 35   create_resources('sitescripts::configfragment', $configfragments) | 
| 44 | 36 | 
| 45   exec { "fetch_sitescripts": | 37   exec { "fetch_sitescripts": | 
| 46     command => "hg clone https://hg.adblockplus.org/sitescripts /opt/sitescripts
    ", | 38     command => "hg clone https://hg.adblockplus.org/sitescripts /opt/sitescripts
    ", | 
| 47     path => ["/usr/bin/", "/bin/"], | 39     path => ["/usr/bin/", "/bin/"], | 
| 48     require => Package['mercurial'], | 40     require => Package['mercurial'], | 
| 49     onlyif => "test ! -d /opt/sitescripts" | 41     onlyif => "test ! -d /opt/sitescripts" | 
| 50   } | 42   } | 
| 51 | 43 | 
| 52   cron {"update_sitescripts": | 44   cron {"update_sitescripts": | 
| 53     ensure => present, | 45     ensure => present, | 
| 54     command => "hg pull -q -u -R /opt/sitescripts && /opt/sitescripts/ensure_dep
    endencies.py -q", | 46     command => "hg pull -q -u -R /opt/sitescripts && /opt/sitescripts/ensure_dep
    endencies.py -q", | 
| 55     environment => hiera('cron::environment', []), | 47     environment => hiera('cron::environment', []), | 
| 56     user => root, | 48     user => root, | 
| 57     require => Exec["fetch_sitescripts"], | 49     require => Exec["fetch_sitescripts"], | 
| 58   } | 50   } | 
| 59 } | 51 } | 
| OLD | NEW | 
|---|