Unified Diff: modules/base/manifests/init.pp
Issue 29338470:
Issue 3818 - Replace custom stages with stdlib equivalent (Closed)
Patch Set:
Created March 16, 2016, 7:15 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/base/manifests/init.pp |
| diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp |
| index 1b48d019ff83155637ad956ac693bd1164d89d70..a2a7b8bfec961ca740e977998c9c3f2e4a051aca 100644 |
| --- a/modules/base/manifests/init.pp |
| +++ b/modules/base/manifests/init.pp |
| @@ -1,12 +1,6 @@ |
| class base ($zone='adblockplus.org') { |
| - stage {'pre': before => Stage['main']} |
| - stage {'post': require => Stage['main']} |
| - class {'users': |
| - stage => 'pre', |
| - } |
| - |
| - include postfix, ssh |
| + include postfix, ssh, stdlib |
| package {['mercurial', 'vim', 'emacs', 'debian-goodies', 'htop']: |
| ensure => present, |
| @@ -17,8 +11,12 @@ class base ($zone='adblockplus.org') { |
| enable => true, |
| } |
| + class {'users': |
| + stage => 'setup', |
| + } |
| + |
| class {'logrotate': |
| - stage => 'post' |
| + stage => 'runtime', |
| } |
| $servers = hiera('servers') |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
