| 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 27 matching lines...) Expand all  Loading... | 
| 38   $directory = '/var/adblockplus' | 38   $directory = '/var/adblockplus' | 
| 39 | 39 | 
| 40   # A common location for directories specific to the adblockplus:: setups, | 40   # A common location for directories specific to the adblockplus:: setups, | 
| 41   # managed via Puppet, but accessible by all users with access to the system | 41   # managed via Puppet, but accessible by all users with access to the system | 
| 42   @file {$directory: | 42   @file {$directory: | 
| 43     ensure => 'directory', | 43     ensure => 'directory', | 
| 44     mode => 0755, | 44     mode => 0755, | 
| 45     owner => 'root', | 45     owner => 'root', | 
| 46   } | 46   } | 
| 47 | 47 | 
|  | 48   # Work around https://issues.adblockplus.org/ticket/3479 | 
|  | 49   if $::environment == 'development' { | 
|  | 50 | 
|  | 51     file { | 
|  | 52       '/etc/ssh/ssh_host_rsa_key': | 
|  | 53         source => 'puppet:///modules/adblockplus/development_host_rsa_key', | 
|  | 54         mode => 600, | 
|  | 55         notify => Service['ssh']; | 
|  | 56       '/etc/ssh/ssh_host_rsa_key.pub': | 
|  | 57         source => 'puppet:///modules/adblockplus/development_host_rsa_key.pub', | 
|  | 58         mode => 644; | 
|  | 59     } | 
|  | 60   } | 
|  | 61 | 
| 48   # See modules/adblockplus/manifests/user.pp | 62   # See modules/adblockplus/manifests/user.pp | 
| 49   create_resources('adblockplus::user', $users) | 63   create_resources('adblockplus::user', $users) | 
| 50 } | 64 } | 
| OLD | NEW | 
|---|