Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: modules/base/manifests/init.pp

Issue 29338036: Issue 3574 - Move APT setup from class base to module adblockplus (Closed)
Patch Set: Issue 3574 - Fix typo: $enfironment => $environment Created March 9, 2016, 7:33 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « modules/adblockplus/manifests/init.pp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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']) {
10 class {'apt':
11 always_apt_update => true
12 }
13 }
14
15 # Note that APT dependencies are excluded here!
16 Exec['apt_update'] -> Package <|title != 'python-software-properties'|>
17
18 include postfix, ssh 9 include postfix, ssh
19 10
20 package {['mercurial', 'vim', 'emacs', 'debian-goodies', 'htop']: 11 package {['mercurial', 'vim', 'emacs', 'debian-goodies', 'htop']:
21 ensure => present, 12 ensure => present,
22 } 13 }
23 14
24 service {'cron': 15 service {'cron':
25 ensure => running, 16 ensure => running,
26 enable => true, 17 enable => true,
27 } 18 }
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 } 67 }
77 } 68 }
78 69
79 # Work around https://projects.puppetlabs.com/issues/4145 70 # Work around https://projects.puppetlabs.com/issues/4145
80 Sshkey<| |> -> 71 Sshkey<| |> ->
81 file {'/etc/ssh/ssh_known_hosts': 72 file {'/etc/ssh/ssh_known_hosts':
82 ensure => 'present', 73 ensure => 'present',
83 mode => 0644, 74 mode => 0644,
84 } 75 }
85 } 76 }
OLDNEW
« no previous file with comments | « modules/adblockplus/manifests/init.pp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld