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

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

Issue 29326147: Issue 3019 - Fix type apt::ppa dependency ordering (Closed)
Patch Set: Created Sept. 8, 2015, 3:21 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 | « no previous file | 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']) { 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 Exec['apt_update'] -> Package <| |> 15 # Node that APT dependencies are excluded here!
16 Exec['apt_update'] -> Package <|name != 'python-software-properties'|>
16 17
17 include private::users, postfix, ssh 18 include private::users, postfix, ssh
18 19
19 package {['mercurial', 'vim', 'emacs', 'debian-goodies', 'htop']: 20 package {['mercurial', 'vim', 'emacs', 'debian-goodies', 'htop']:
20 ensure => present, 21 ensure => present,
21 } 22 }
22 23
23 file {'/etc/timezone': 24 file {'/etc/timezone':
24 ensure => file, 25 ensure => file,
25 owner => root, 26 owner => root,
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 } 92 }
92 93
93 # Work around https://projects.puppetlabs.com/issues/4145 94 # Work around https://projects.puppetlabs.com/issues/4145
94 Sshkey<| |> -> 95 Sshkey<| |> ->
95 file {'/etc/ssh/ssh_known_hosts': 96 file {'/etc/ssh/ssh_known_hosts':
96 ensure => 'present', 97 ensure => 'present',
97 mode => 0644, 98 mode => 0644,
98 } 99 }
99 } 100 }
100 101
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld