diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-15 12:47:12 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-15 12:47:12 -0400 |
| commit | 0e7099174fdef951c81880b51e23342fcde86374 (patch) | |
| tree | 28e99fd804674e3ac025a73a061c73f0ce6d7870 /manifests/package.pp | |
| parent | 3ac4d6249f50627c0827ce3812eb21d5b89ed974 (diff) | |
| parent | bf36ba5e988a7bb3f163ed0575020ef714519edc (diff) | |
Merge remote-tracking branch 'shared/master' into riseup
Conflicts:
README
Diffstat (limited to 'manifests/package.pp')
| -rw-r--r-- | manifests/package.pp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/package.pp b/manifests/package.pp index aa47c6c..3308b37 100644 --- a/manifests/package.pp +++ b/manifests/package.pp @@ -19,13 +19,13 @@ class apache::package inherits apache::base { File['modules_dir']{ require => Package[apache], } - File['web_dir']{ + File['include_dir']{ require => Package[apache], } - File['htpasswd_dir']{ + File['web_dir']{ require => Package[apache], } - File['include_dir']{ + File['htpasswd_dir']{ require => Package[apache], } } |