[Mageia-sysadm] [481] Fix the check on wget if server is down (thanks to rtp)

Michael scherer misc at zarb.org
Fri Nov 26 19:38:15 CET 2010


On Fri, Nov 26, 2010 at 05:57:31PM +0100, root at mageia.org wrote:
> Revision: 481
> Author:   dams
> Date:     2010-11-26 17:57:31 +0100 (Fri, 26 Nov 2010)
> Log Message:
> -----------
> Fix the check on wget if server is down (thanks to rtp)
> 
> Modified Paths:
> --------------
>     puppet/modules/blog/manifests/init.pp
>     puppet/modules/blog/templates/check_new-blog-post.sh
> 
> Added Paths:
> -----------
>     puppet/modules/blog/templates/.htaccess

I suggest that we avoid committing hidden file for template, as they can
be renamed afterward by puppet. There is no use to hide them in the repository.

Morever, I also think we should avoid using .htaccess when we can directly change 
apache config on the vhost, mainly for performance reasons as higlighted by apache
documentation : http://httpd.apache.org/docs/trunk/howto/htaccess.html

However, I suspect this is a wrong commit.
( in which case, I would suggest to use http://www.vim.org/scripts/script.php?script_id=978 )

> Modified: puppet/modules/blog/manifests/init.pp
> ===================================================================
> --- puppet/modules/blog/manifests/init.pp	2010-11-26 15:36:45 UTC (rev 480)
> +++ puppet/modules/blog/manifests/init.pp	2010-11-26 16:57:31 UTC (rev 481)
> @@ -5,13 +5,13 @@
>          	ensure => installed
>      	}
>  
> -        package { 'wget':
> +        package { 'php-mysql':
>                  ensure => installed
>          }
>  
>      include apache::mod_php
>  
> -    	package { 'php-mysql':
> +    	package { 'wget':
>          	ensure => installed
>      	}

Seems like a gratuitous change that should not have been committed , or there is 
something subtil I missed ( if this is a ordering problem, then the solution should
be to use require, not to change the order )

-- 
Michael Scherer


More information about the Mageia-sysadm mailing list