diff options
| author | Damien Lallement <dams@mageia.org> | 2010-11-26 16:57:31 +0000 |
|---|---|---|
| committer | Damien Lallement <dams@mageia.org> | 2010-11-26 16:57:31 +0000 |
| commit | ffc55a0179fda19964c9b6cf09d5a2bf032d2437 (patch) | |
| tree | f988a00c8e6e9896cabec7c65ec9ecef42bbfb32 | |
| parent | cd2322fded52ca44fb6372e0379a776f4a320dcb (diff) | |
| download | puppet-ffc55a0179fda19964c9b6cf09d5a2bf032d2437.tar puppet-ffc55a0179fda19964c9b6cf09d5a2bf032d2437.tar.gz puppet-ffc55a0179fda19964c9b6cf09d5a2bf032d2437.tar.bz2 puppet-ffc55a0179fda19964c9b6cf09d5a2bf032d2437.tar.xz puppet-ffc55a0179fda19964c9b6cf09d5a2bf032d2437.zip | |
Fix the check on wget if server is down (thanks to rtp)
| -rw-r--r-- | modules/blog/manifests/init.pp | 4 | ||||
| -rw-r--r-- | modules/blog/templates/.htaccess | 10 | ||||
| -rwxr-xr-x | modules/blog/templates/check_new-blog-post.sh | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp index ab7f9ec0..05a8bae1 100644 --- a/modules/blog/manifests/init.pp +++ b/modules/blog/manifests/init.pp @@ -5,13 +5,13 @@ class blog { ensure => installed } - package { 'wget': + package { 'php-mysql': ensure => installed } include apache::mod_php - package { 'php-mysql': + package { 'wget': ensure => installed } diff --git a/modules/blog/templates/.htaccess b/modules/blog/templates/.htaccess new file mode 100644 index 00000000..19bee3bd --- /dev/null +++ b/modules/blog/templates/.htaccess @@ -0,0 +1,10 @@ +# BEGIN WordPress +<IfModule mod_rewrite.c> +RewriteEngine On +RewriteBase / +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d +RewriteRule . /index.php [L] +</IfModule> + +# END WordPress diff --git a/modules/blog/templates/check_new-blog-post.sh b/modules/blog/templates/check_new-blog-post.sh index c3183375..8efc94ab 100755 --- a/modules/blog/templates/check_new-blog-post.sh +++ b/modules/blog/templates/check_new-blog-post.sh @@ -3,7 +3,7 @@ # Initialization PATH_TO_FILE=${PATH_TO_FILE:-/var/lib/blog} /usr/bin/wget -qO $PATH_TO_FILE"/RSS_new" http://blog.mageia.org/?feed=rss2 -if [ -n $? ] +if [ $? -ne 0 ] then exit 2 fi |