| OLD | NEW | 
|---|
| 1 # == Class: adblockplus | 1 # == Class: adblockplus | 
| 2 # | 2 # | 
| 3 # The adblockplus class and the associated adblockplus:: namespace are | 3 # The adblockplus class and the associated adblockplus:: namespace are | 
| 4 # used to integrate Puppet modules with each other, in order to assemble | 4 # used to integrate Puppet modules with each other, in order to assemble | 
| 5 # the setups used by the Adblock Plus project. | 5 # the setups used by the Adblock Plus project. | 
| 6 # | 6 # | 
| 7 # === Parameters: | 7 # === Parameters: | 
| 8 # | 8 # | 
| 9 # [*authority*] | 9 # [*authority*] | 
| 10 #   The authorative domain or zone associated with the current environment, | 10 #   The authorative domain or zone associated with the current environment, | 
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 69       group => 'root', | 69       group => 'root', | 
| 70       mode => 0644, | 70       mode => 0644, | 
| 71       notify => Service['cron'], | 71       notify => Service['cron'], | 
| 72       owner => 'root'; | 72       owner => 'root'; | 
| 73     '/etc/localtime': | 73     '/etc/localtime': | 
| 74       ensure => 'link', | 74       ensure => 'link', | 
| 75       target => '/usr/share/zoneinfo/UTC', | 75       target => '/usr/share/zoneinfo/UTC', | 
| 76       notify => Service['cron']; | 76       notify => Service['cron']; | 
| 77   } | 77   } | 
| 78 | 78 | 
|  | 79   # Explicit resource required only to ensure cron(8) is running; | 
|  | 80   # there is no real requirement for a rationship with another resource | 
|  | 81   service {'cron': | 
|  | 82     ensure => 'running', | 
|  | 83     enable => true, | 
|  | 84   } | 
|  | 85 | 
| 79   # Work around https://issues.adblockplus.org/ticket/3479 | 86   # Work around https://issues.adblockplus.org/ticket/3479 | 
| 80   if $::environment == 'development' { | 87   if $::environment == 'development' { | 
| 81 | 88 | 
| 82     file { | 89     file { | 
| 83       '/etc/ssh/ssh_host_rsa_key': | 90       '/etc/ssh/ssh_host_rsa_key': | 
| 84         source => 'puppet:///modules/adblockplus/development_host_rsa_key', | 91         source => 'puppet:///modules/adblockplus/development_host_rsa_key', | 
| 85         mode => 600, | 92         mode => 600, | 
| 86         notify => Service['ssh']; | 93         notify => Service['ssh']; | 
| 87       '/etc/ssh/ssh_host_rsa_key.pub': | 94       '/etc/ssh/ssh_host_rsa_key.pub': | 
| 88         source => 'puppet:///modules/adblockplus/development_host_rsa_key.pub', | 95         source => 'puppet:///modules/adblockplus/development_host_rsa_key.pub', | 
| 89         mode => 644; | 96         mode => 644; | 
| 90     } | 97     } | 
| 91   } | 98   } | 
| 92 | 99 | 
| 93   # Fix implicit package dependency Class['apt'] does not properly handle | 100   # Fix implicit package dependency Class['apt'] does not properly handle | 
| 94   Exec['apt_update'] -> Package<|title != 'python-software-properties'|> | 101   Exec['apt_update'] -> Package<|title != 'python-software-properties'|> | 
| 95 | 102 | 
| 96   # https://projects.puppetlabs.com/issues/4145 | 103   # https://projects.puppetlabs.com/issues/4145 | 
| 97   ensure_resource('file', '/etc/ssh/ssh_known_hosts', { | 104   ensure_resource('file', '/etc/ssh/ssh_known_hosts', { | 
| 98     ensure => 'present', | 105     ensure => 'present', | 
| 99     mode => 0644, | 106     mode => 0644, | 
| 100   }) | 107   }) | 
| 101 | 108 | 
| 102   # See modules/adblockplus/manifests/host.pp | 109   # See modules/adblockplus/manifests/host.pp | 
| 103   create_resources('adblockplus::host', $hosts) | 110   create_resources('adblockplus::host', $hosts) | 
| 104 | 111 | 
| 105   # See modules/adblockplus/manifests/user.pp | 112   # See modules/adblockplus/manifests/user.pp | 
| 106   create_resources('adblockplus::user', $users) | 113   create_resources('adblockplus::user', $users) | 
| 107 } | 114 } | 
| OLD | NEW | 
|---|