From 21da6bd2416756cd90132c68e9d77e4da18fbb8d Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Mon, 20 Feb 2012 18:34:19 +0000 Subject: clean epoll module, using puppet-lint and common value --- modules/epoll/manifests/init.pp | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) (limited to 'modules') diff --git a/modules/epoll/manifests/init.pp b/modules/epoll/manifests/init.pp index 147ad405..091da8f3 100644 --- a/modules/epoll/manifests/init.pp +++ b/modules/epoll/manifests/init.pp @@ -1,34 +1,28 @@ class epoll { - $vhost = "epoll.$domain" + $vhost = "epoll.$::domain" + + package { 'Epoll': } - package { 'Epoll': - ensure => installed - } - apache::vhost_catalyst_app { $vhost: - script => "/usr/bin/epoll_fastcgi.pl", - use_ssl => true, + script => '/usr/bin/epoll_fastcgi.pl', + use_ssl => true, require => Package['Epoll'] } apache::vhost_redirect_ssl { $vhost: } - - $pgsql_password = extlookup("epoll_pgsql",'x') + + $pgsql_password = extlookup('epoll_pgsql','x') postgresql::remote_db_and_user { 'epoll': - description => "Epoll database", - password => $pgsql_password, + description => 'Epoll database', + password => $pgsql_password, } - - file { "epoll.yml": - path => "/etc/epoll.yml", - ensure => "present", - owner => root, - group => apache, - mode => 640, - content => template("epoll/epoll.yml") + file { 'epoll.yml': + path => '/etc/epoll.yml', + group => 'apache', + mode => '0640', + content => template('epoll/epoll.yml') } - } -- cgit v1.2.1