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

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

Issue 4913325238386688: Issue 2247 - Include Package["htop"] with class base (Closed)
Patch Set: Created March 31, 2015, 2:20 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 class {'apt': 9 class {'apt':
10 always_apt_update => true 10 always_apt_update => true
11 } 11 }
12 12
13 Exec['apt_update'] -> Package <| |> 13 Exec['apt_update'] -> Package <| |>
14 14
15 include private::users, postfix, ssh 15 include private::users, postfix, ssh
16 16
17 package {['mercurial', 'vim', 'emacs', 'debian-goodies']: ensure => present} 17 package {['mercurial', 'vim', 'emacs', 'debian-goodies', 'htop']:
18 ensure => present,
19 }
18 20
19 file {'/etc/timezone': 21 file {'/etc/timezone':
20 ensure => file, 22 ensure => file,
21 owner => root, 23 owner => root,
22 group => root, 24 group => root,
23 mode => 0644, 25 mode => 0644,
24 content => 'UTC', 26 content => 'UTC',
25 notify => Service['cron'] 27 notify => Service['cron']
26 } 28 }
27 29
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 name => $name_key, 82 name => $name_key,
81 key => $ssh_public_key, 83 key => $ssh_public_key,
82 type => ssh-rsa, 84 type => ssh-rsa,
83 host_aliases => $ip, 85 host_aliases => $ip,
84 } 86 }
85 } 87 }
86 88
87 } 89 }
88 } 90 }
89 91
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