| OLD | NEW |
| 1 class base ($zone='adblockplus.org') { | 1 class base ($zone='adblockplus.org') { |
| 2 stage {'pre': before => Stage['main']} | 2 stage {'pre': before => Stage['main']} |
| 3 stage {'post': require => Stage['main']} | 3 stage {'post': require => Stage['main']} |
| 4 | 4 |
| 5 class {'users': | 5 class {'users': |
| 6 stage => 'pre', | 6 stage => 'pre', |
| 7 } | 7 } |
| 8 | 8 |
| 9 if !defined(Class['apt']) { | 9 if !defined(Class['apt']) { |
| 10 class {'apt': | 10 class {'apt': |
| 11 always_apt_update => true | 11 always_apt_update => true |
| 12 } | 12 } |
| 13 } | 13 } |
| 14 | 14 |
| 15 # Note that APT dependencies are excluded here! | 15 # Note that APT dependencies are excluded here! |
| 16 Exec['apt_update'] -> Package <|title != 'python-software-properties'|> | 16 Exec['apt_update'] -> Package <|title != 'python-software-properties'|> |
| 17 | 17 |
| 18 include postfix, ssh | 18 include postfix, ssh |
| 19 | 19 |
| 20 package {['mercurial', 'vim', 'emacs', 'debian-goodies', 'htop']: | 20 package {['mercurial', 'vim', 'emacs', 'debian-goodies', 'htop']: |
| 21 ensure => present, | 21 ensure => present, |
| 22 } | 22 } |
| 23 | 23 |
| 24 file {'/etc/timezone': | |
| 25 ensure => file, | |
| 26 owner => root, | |
| 27 group => root, | |
| 28 mode => 0644, | |
| 29 content => 'UTC', | |
| 30 notify => Service['cron'] | |
| 31 } | |
| 32 | |
| 33 file {'/etc/localtime': | |
| 34 ensure => link, | |
| 35 target => '/usr/share/zoneinfo/UTC', | |
| 36 notify => Service['cron'] | |
| 37 } | |
| 38 | |
| 39 service {'cron': | 24 service {'cron': |
| 40 ensure => running, | 25 ensure => running, |
| 41 enable => true, | 26 enable => true, |
| 42 } | 27 } |
| 43 | 28 |
| 44 class {'logrotate': | 29 class {'logrotate': |
| 45 stage => 'post' | 30 stage => 'post' |
| 46 } | 31 } |
| 47 | 32 |
| 48 $servers = hiera('servers') | 33 $servers = hiera('servers') |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 } | 76 } |
| 92 } | 77 } |
| 93 | 78 |
| 94 # Work around https://projects.puppetlabs.com/issues/4145 | 79 # Work around https://projects.puppetlabs.com/issues/4145 |
| 95 Sshkey<| |> -> | 80 Sshkey<| |> -> |
| 96 file {'/etc/ssh/ssh_known_hosts': | 81 file {'/etc/ssh/ssh_known_hosts': |
| 97 ensure => 'present', | 82 ensure => 'present', |
| 98 mode => 0644, | 83 mode => 0644, |
| 99 } | 84 } |
| 100 } | 85 } |
| OLD | NEW |