diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-19 16:11:13 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-19 16:11:13 -0200 |
| commit | b1313ab42a83c926cccb724a322285044e02271c (patch) | |
| tree | 68542bbc0912d11623adf05b5d57ba2692e0f3f7 | |
| parent | e7a621dbfecc2c04bda844faf4be07e7a3655972 (diff) | |
| download | puppet-wordpress-b1313ab42a83c926cccb724a322285044e02271c.tar.gz puppet-wordpress-b1313ab42a83c926cccb724a322285044e02271c.tar.bz2 | |
Upgrading for 2.7 compatibility --config
| -rw-r--r-- | manifests/init.pp | 16 | ||||
| -rw-r--r-- | templates/wordpress.sh.erb | 2 |
2 files changed, 6 insertions, 12 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index aa24593..a433910 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,15 +1,9 @@ -class wordpress { +class wordpress( + $folder = ${apache::www_folder}, + $locale = '' +) { - case $wordpress_folder { - '' : { - case $apache_www_folder { - '': { fail("you need to define \$apache_www_folder for wordpress module") } - default: { $wordpress_folder = $apache_www_folder } - } - } - } - - $real_wordpress_locale = $wordpress_locale ? { + $real_wordpress_locale = $locale ? { '' => '', default => "-${wordpress_locale}" } diff --git a/templates/wordpress.sh.erb b/templates/wordpress.sh.erb index 41d739f..826dc82 100644 --- a/templates/wordpress.sh.erb +++ b/templates/wordpress.sh.erb @@ -3,7 +3,7 @@ # wordpress management script. # -BASE="<%= wordpress_folder %>" +BASE="<%= folder %>" LOCALE="<%= real_wordpress_locale %>" # Set alternative base |