| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| (Empty) | |
| 1 class filtermaster { | |
| 2 Cron { | |
| 3 #TODO: Change The MAILTO to the correct paramater befor commiting | |
| 4 environment => ['MAILTO=ROOT', 'PYTHONPATH=/opt/sitescripts'], | |
| 5 } | |
| 6 | |
| 7 class {'ssh': | |
| 8 custom_configuration => 'Match User rsync | |
| 9 AllowTcpForwarding no | |
| 10 X11Forwarding no | |
| 11 AllowAgentForwarding no | |
| 12 GatewayPorts no | |
| 13 ForceCommand rsync --server --sender -vltprz --delete-excluded . /home/rsync /generated/data/' | |
| 14 } | |
| 15 | |
| 16 user {'rsync': | |
| 17 ensure => present, | |
| 18 comment => 'Filter list mirror user', | |
| 19 home => '/home/rsync', | |
| 20 managehome => true | |
| 21 } | |
| 22 | |
| 23 file {'/home/rsync/update_repos.sh': | |
| 24 ensure => file, | |
| 25 owner => rsync, | |
| 26 mode => 0700, | |
| 27 source => 'puppet:///modules/filtermaster/update_repos.sh' | |
| 28 } | |
| 29 | |
| 30 file {'/home/rsync/.ssh': | |
| 31 ensure => directory, | |
| 32 owner => rsync, | |
| 33 mode => 0600 | |
| 34 } | |
| 35 | |
| 36 file {'/home/rsync/subscription': | |
| 37 ensure => directory, | |
| 38 owner => rsync | |
| 39 } | |
| 40 | |
| 41 file {'/home/rsync/generated': | |
| 42 ensure => directory, | |
| 43 owner => rsync | |
| 44 } | |
| 45 | |
| 46 file {'/home/rsync/.ssh/authorized_keys': | |
| 47 ensure => file, | |
| 48 require => File['/home/rsync/.ssh'], | |
|
Wladimir Palant
2013/11/13 14:03:51
As I said, *both* requires are unnecessary - the p
christian
2013/11/13 14:15:27
Done.
| |
| 49 owner => rsync, | |
| 50 mode => 0600, | |
| 51 source => 'puppet:///modules/filtermaster/authorized_keys' | |
| 52 } | |
| 53 | |
| 54 package {['p7zip-full']:} | |
| 55 | |
| 56 define repo_download( ) { | |
| 57 exec { "fetch_${title}": | |
| 58 command => "hg clone https://hg.adblockplus.org/${title} /home/rsync/subs cription/${title}", | |
| 59 path => ["/usr/bin/", "/bin/"], | |
| 60 require => Package['mercurial'], | |
| 61 user => rsync, | |
| 62 timeout => 0, | |
| 63 onlyif => "test ! -d /home/rsync/subscription/${title}" | |
| 64 } | |
| 65 } | |
| 66 | |
| 67 repo_download {['easylist', | |
| 68 'easylistgermany', | |
| 69 'easylistitaly', | |
| 70 'easylistcombinations', | |
| 71 'malwaredomains', | |
| 72 'ruadlist', | |
| 73 'listefr', | |
| 74 'exceptionrules', | |
| 75 'easylistdutch', | |
| 76 'facebookfilters', | |
| 77 'antiadblockfilters' | |
| 78 ]: | |
| 79 } | |
| 80 | |
| 81 cron {'update_subscription': | |
| 82 ensure => present, | |
| 83 command => "python -m sitescripts.subscriptions.bin.updateSubscriptionDownlo ads 3>&1 1>/dev/null 2>&3 | perl -pe 's/^/\"[\" . scalar localtime() . \"] \"/e' >> /tmp/subscription_errors && chmod 666 /tmp/subscription_errors 2>/dev/null", | |
| 84 user => rsync, | |
| 85 require => [ | |
| 86 User['rsync'] | |
| 87 ], | |
| 88 minute => '*/10' | |
| 89 } | |
| 90 | |
| 91 cron {'update_malware': | |
| 92 ensure => present, | |
| 93 command => "python -m sitescripts.subscriptions.bin.updateMalwareDomainsList ", | |
| 94 user => rsync, | |
| 95 require => [ | |
| 96 User['rsync'] | |
| 97 ], | |
| 98 hour => '*/6', | |
| 99 minute => 15 | |
| 100 } | |
| 101 | |
| 102 cron {'update_repos': | |
| 103 ensure => present, | |
| 104 command => "/home/rsync/update_repos.sh", | |
| 105 user => rsync, | |
| 106 require => [ | |
| 107 User['rsync'], | |
| 108 File['/home/rsync/update_repos.sh'] | |
| 109 ], | |
| 110 minute => '8-58/10' | |
| 111 } | |
| 112 | |
| 113 class {'sitescripts': | |
| 114 sitescriptsini_source => 'puppet:///modules/filtermaster/sitescripts' | |
| 115 } | |
| 116 } | |
| OLD | NEW |