aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-02-20 18:34:19 +0000
committerMichael Scherer <misc@mageia.org>2012-02-20 18:34:19 +0000
commit21da6bd2416756cd90132c68e9d77e4da18fbb8d (patch)
tree0e4002796f296ec2fc1a70af9eb57e4207acc48e
parent2834e4aa8ae6a82188d06129763b4a8115e96b45 (diff)
downloadpuppet-21da6bd2416756cd90132c68e9d77e4da18fbb8d.tar
puppet-21da6bd2416756cd90132c68e9d77e4da18fbb8d.tar.gz
puppet-21da6bd2416756cd90132c68e9d77e4da18fbb8d.tar.bz2
puppet-21da6bd2416756cd90132c68e9d77e4da18fbb8d.tar.xz
puppet-21da6bd2416756cd90132c68e9d77e4da18fbb8d.zip
clean epoll module, using puppet-lint and common value
-rw-r--r--modules/epoll/manifests/init.pp34
1 files changed, 14 insertions, 20 deletions
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')
}
-
}