| OLD | NEW |
| 1 class filtermaster( | 1 class filtermaster( |
| 2 $repos = hiera('filtermaster::repos', []), | 2 $repos = hiera('filtermaster::repos', []), |
| 3 $repo_downloads = hiera('filtermaster::repo_downloads', {}), | 3 $repo_downloads = hiera('filtermaster::repo_downloads', {}), |
| 4 $malwaredomains_mirrors = hiera('filtermaster::malwaredomains_mirrors', []), | 4 $malwaredomains_mirrors = hiera('filtermaster::malwaredomains_mirrors', []), |
| 5 ) { | 5 ) { |
| 6 | 6 |
| 7 Cron { | 7 Cron { |
| 8 environment => concat(hiera('cron::environment', []), [ | 8 environment => concat(hiera('cron::environment', []), [ |
| 9 'PYTHONPATH=/opt/sitescripts', | 9 'PYTHONPATH=/opt/sitescripts', |
| 10 ]), | 10 ]), |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 user {'rsync': | 30 user {'rsync': |
| 31 ensure => present, | 31 ensure => present, |
| 32 comment => 'Filter list mirror user', | 32 comment => 'Filter list mirror user', |
| 33 home => '/home/rsync', | 33 home => '/home/rsync', |
| 34 managehome => true | 34 managehome => true |
| 35 } | 35 } |
| 36 | 36 |
| 37 file {'/home/rsync/update_repos.sh': | 37 file {'/home/rsync/update_repos.sh': |
| 38 ensure => file, | 38 ensure => file, |
| 39 owner => rsync, | 39 owner => rsync, |
| 40 mode => 0700, | 40 mode => '0700', |
| 41 source => 'puppet:///modules/filtermaster/update_repos.sh' | 41 source => 'puppet:///modules/filtermaster/update_repos.sh' |
| 42 } | 42 } |
| 43 | 43 |
| 44 file {'/home/rsync/subscription': | 44 file {'/home/rsync/subscription': |
| 45 ensure => directory, | 45 ensure => directory, |
| 46 owner => rsync | 46 owner => rsync |
| 47 } | 47 } |
| 48 | 48 |
| 49 file {'/home/rsync/generated': | 49 file {'/home/rsync/generated': |
| 50 ensure => directory, | 50 ensure => directory, |
| 51 owner => rsync | 51 owner => rsync |
| 52 } | 52 } |
| 53 | 53 |
| 54 file {'/home/rsync/generated/gzip': | 54 file {'/home/rsync/generated/gzip': |
| 55 ensure => directory, | 55 ensure => directory, |
| 56 owner => rsync, | 56 owner => rsync, |
| 57 require => File['/home/rsync/generated'], | 57 require => File['/home/rsync/generated'], |
| 58 } | 58 } |
| 59 | 59 |
| 60 file {'/home/rsync/.ssh': | 60 file {'/home/rsync/.ssh': |
| 61 ensure => directory, | 61 ensure => directory, |
| 62 owner => rsync, | 62 owner => rsync, |
| 63 mode => 0600 | 63 mode => '0600' |
| 64 } | 64 } |
| 65 | 65 |
| 66 file {'/home/rsync/.ssh/authorized_keys': | 66 file {'/home/rsync/.ssh/authorized_keys': |
| 67 ensure => file, | 67 ensure => file, |
| 68 owner => rsync, | 68 owner => rsync, |
| 69 mode => 0600, | 69 mode => '0600', |
| 70 source => 'puppet:///modules/private/rsync@easylist-downloads.adblockplus.or
g.pub' | 70 source => 'puppet:///modules/private/rsync@easylist-downloads.adblockplus.or
g.pub' |
| 71 } | 71 } |
| 72 | 72 |
| 73 file {'/etc/ssh/ssh_host_ecdsa_key': | 73 file {'/etc/ssh/ssh_host_ecdsa_key': |
| 74 require => Package['openssh-server'], | 74 require => Package['openssh-server'], |
| 75 notify => Service['ssh'], | 75 notify => Service['ssh'], |
| 76 ensure => file, | 76 ensure => file, |
| 77 owner => root, | 77 owner => root, |
| 78 group => root, | 78 group => root, |
| 79 mode => 600, | 79 mode => '600', |
| 80 source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.key' | 80 source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.key' |
| 81 } | 81 } |
| 82 | 82 |
| 83 file {'/etc/ssh/ssh_host_ecdsa_key.pub': | 83 file {'/etc/ssh/ssh_host_ecdsa_key.pub': |
| 84 require => Package['openssh-server'], | 84 require => Package['openssh-server'], |
| 85 notify => Service['ssh'], | 85 notify => Service['ssh'], |
| 86 ensure => file, | 86 ensure => file, |
| 87 owner => root, | 87 owner => root, |
| 88 group => root, | 88 group => root, |
| 89 source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.pub' | 89 source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.pub' |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 User['rsync'], | 121 User['rsync'], |
| 122 File['/home/rsync/update_repos.sh'] | 122 File['/home/rsync/update_repos.sh'] |
| 123 ], | 123 ], |
| 124 minute => '8-58/10' | 124 minute => '8-58/10' |
| 125 } | 125 } |
| 126 | 126 |
| 127 class {'sitescripts': | 127 class {'sitescripts': |
| 128 sitescriptsini_content => template('filtermaster/sitescripts.ini.erb'), | 128 sitescriptsini_content => template('filtermaster/sitescripts.ini.erb'), |
| 129 } | 129 } |
| 130 } | 130 } |
| OLD | NEW |