Side by Side Diff: modules/base/manifests/init.pp
Issue 29335877:
Issue 3587 - Remove class private::users (Closed)
Patch Set:
Created Feb. 7, 2016, 2:49 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
modules/private-stub/hiera/base.yaml » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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 private::users, 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': | 24 file {'/etc/timezone': |
| 25 ensure => file, | 25 ensure => file, |
| 26 owner => root, | 26 owner => root, |
| 27 group => root, | 27 group => root, |
| 28 mode => 0644, | 28 mode => 0644, |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 105 '/etc/ssh/ssh_host_rsa_key': | 105 '/etc/ssh/ssh_host_rsa_key': |
| 106 source => 'puppet:///modules/base/development_host_rsa_key', | 106 source => 'puppet:///modules/base/development_host_rsa_key', |
| 107 mode => 600, | 107 mode => 600, |
| 108 notify => Service['ssh']; | 108 notify => Service['ssh']; |
| 109 '/etc/ssh/ssh_host_rsa_key.pub': | 109 '/etc/ssh/ssh_host_rsa_key.pub': |
| 110 source => 'puppet:///modules/base/development_host_rsa_key.pub', | 110 source => 'puppet:///modules/base/development_host_rsa_key.pub', |
| 111 mode => 644; | 111 mode => 644; |
| 112 } | 112 } |
| 113 } | 113 } |
| 114 } | 114 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
modules/private-stub/hiera/base.yaml » ('j')
|
no next file with comments »
