OLD | NEW |
1 class filtermaster { | 1 class filtermaster { |
2 Cron { | 2 Cron { |
3 environment => ['MAILTO=admin@adblockplus.org', 'PYTHONPATH=/opt/sitescripts
'], | 3 environment => ['MAILTO=admin@adblockplus.org', 'PYTHONPATH=/opt/sitescripts
'], |
4 } | 4 } |
5 | 5 |
6 class {'ssh': | 6 class {'ssh': |
7 custom_configuration => 'Match User rsync | 7 custom_configuration => 'Match User rsync |
8 AllowTcpForwarding no | 8 AllowTcpForwarding no |
9 X11Forwarding no | 9 X11Forwarding no |
10 AllowAgentForwarding no | 10 AllowAgentForwarding no |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 mode => 0600 | 42 mode => 0600 |
43 } | 43 } |
44 | 44 |
45 file {'/home/rsync/.ssh/authorized_keys': | 45 file {'/home/rsync/.ssh/authorized_keys': |
46 ensure => file, | 46 ensure => file, |
47 owner => rsync, | 47 owner => rsync, |
48 mode => 0600, | 48 mode => 0600, |
49 source => 'puppet:///modules/private/rsync@easylist-downloads.adblockplus.or
g.pub' | 49 source => 'puppet:///modules/private/rsync@easylist-downloads.adblockplus.or
g.pub' |
50 } | 50 } |
51 | 51 |
52 file {'/etc/ssh/ssh_host_rsa_key': | 52 file {'/etc/ssh/ssh_host_ecdsa_key': |
53 require => Package['openssh-server'], | 53 require => Package['openssh-server'], |
54 notify => Service['ssh'], | 54 notify => Service['ssh'], |
55 ensure => file, | 55 ensure => file, |
56 owner => root, | 56 owner => root, |
57 group => root, | 57 group => root, |
| 58 mode => 600, |
58 source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.key' | 59 source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.key' |
59 } | 60 } |
60 | 61 |
61 file {'/etc/ssh/ssh_host_rsa_key.pub': | 62 file {'/etc/ssh/ssh_host_ecdsa_key.pub': |
62 require => Package['openssh-server'], | 63 require => Package['openssh-server'], |
63 notify => Service['ssh'], | 64 notify => Service['ssh'], |
64 ensure => file, | 65 ensure => file, |
65 owner => root, | 66 owner => root, |
66 group => root, | 67 group => root, |
67 source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.pub' | 68 source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.pub' |
68 } | 69 } |
69 | 70 |
70 package {['p7zip-full']:} | 71 package {['p7zip-full']:} |
71 | 72 |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 User['rsync'], | 120 User['rsync'], |
120 File['/home/rsync/update_repos.sh'] | 121 File['/home/rsync/update_repos.sh'] |
121 ], | 122 ], |
122 minute => '8-58/10' | 123 minute => '8-58/10' |
123 } | 124 } |
124 | 125 |
125 class {'sitescripts': | 126 class {'sitescripts': |
126 sitescriptsini_source => 'puppet:///modules/filtermaster/sitescripts' | 127 sitescriptsini_source => 'puppet:///modules/filtermaster/sitescripts' |
127 } | 128 } |
128 } | 129 } |
OLD | NEW |