diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2020-12-05 14:23:53 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2020-12-05 14:23:53 -0300 |
| commit | 50ffe8ba906ca2f3952f557cd2655fa7c34f0da5 (patch) | |
| tree | 00137d0f68aa727a683cfe51cacf0918d40bf596 | |
| parent | 762807dcfa316ec957da1349a713cdf6ab747d36 (diff) | |
| download | puppet-apache-50ffe8ba906ca2f3952f557cd2655fa7c34f0da5.tar.gz puppet-apache-50ffe8ba906ca2f3952f557cd2655fa7c34f0da5.tar.bz2 | |
Fix: cleanup macro definitions
| -rw-r--r-- | templates/macros.erb | 44 |
1 files changed, 12 insertions, 32 deletions
diff --git a/templates/macros.erb b/templates/macros.erb index 3b5f9e3..2c04117 100644 --- a/templates/macros.erb +++ b/templates/macros.erb @@ -37,54 +37,34 @@ # end wiki config </Macro> -<Macro Site $name> - # begin site config - <Directory <%= scope.lookupvar('apache::sites_folder') %>/$name/site> +<Macro DirectoryAllowAll $name $folder> + # begin $name config + <Directory <%= scope.lookupvar('apache::sites_folder') %>/$name/$folder> Options Indexes Includes FollowSymLinks MultiViews AllowOverride All Require all granted </Directory> - # end site config + # end $name config +</Macro> + +<Macro Site $name> + Use DirectoryAllowAll $name site </Macro> <Macro Www $name> - # begin site config - <Directory <%= scope.lookupvar('apache::sites_folder') %>/$name/www> - Options Indexes Includes FollowSymLinks MultiViews - AllowOverride All - Require all granted - </Directory> - # end site config + Use DirectoryAllowAll $name www </Macro> <Macro Web $name> - # begin site config - <Directory <%= scope.lookupvar('apache::sites_folder') %>/$name/web> - Options Indexes Includes FollowSymLinks MultiViews - AllowOverride All - Require all granted - </Directory> - # end site config + Use DirectoryAllowAll $name web </Macro> <Macro Src $name> - # begin site config - <Directory <%= scope.lookupvar('apache::sites_folder') %>/$name/src> - Options Indexes Includes FollowSymLinks MultiViews - AllowOverride All - Require all granted - </Directory> - # end site config + Use DirectoryAllowAll $name src </Macro> <Macro Html $name> - # begin site config - <Directory <%= scope.lookupvar('apache::sites_folder') %>/$name/html> - Options Indexes Includes FollowSymLinks MultiViews - AllowOverride All - Require all granted - </Directory> - # end site config + Use DirectoryAllowAll $name html </Macro> <Macro Trac $site> |