summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-02-06 14:19:52 -0500
committerMicah Anderson <micah@riseup.net>2013-02-06 14:19:52 -0500
commitf4035abaa2e625ea349d6a11a33ac61e2a0041ce (patch)
tree5fc148a02db7fbac09f607ebb5bc326252102e19
parentce1ebea7cc3911ebac616a8a065a484b9452e72b (diff)
linting the module
-rw-r--r--manifests/init.pp114
-rw-r--r--manifests/lighty.pp8
2 files changed, 61 insertions, 61 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index e96cf2d..ffa7c21 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -11,20 +11,20 @@ class reprepro (
$handle_incoming_with_inotify = false
){
package {
- "reprepro": ensure => 'installed';
+ 'reprepro': ensure => 'installed';
}
- user { "reprepro":
- ensure => "present",
- home => "$basedir",
- gid => "reprepro",
- password => "*",
- comment => "reprepro sandbox",
- require => Group["reprepro"],
+ user { 'reprepro':
+ ensure => present,
+ home => $basedir,
+ gid => 'reprepro',
+ password => '*',
+ comment => 'reprepro sandbox',
+ require => Group['reprepro'],
}
- if !defined(Group["reprepro"]) {
- group { "reprepro":
+ if !defined(Group['reprepro']) {
+ group { 'reprepro':
ensure => present,
}
}
@@ -34,54 +34,54 @@ class reprepro (
group => reprepro,
}
- file { "$basedir":
+ file { $basedir:
ensure => directory,
- mode => $basedir_mode,
+ mode => $basedir_mode,
}
- file { "$basedir/conf":
+ file { "${basedir}/conf":
ensure => directory,
- mode => '0770',
+ mode => '0770',
}
- file { "$basedir/db":
+ file { "${basedir}/db":
ensure => directory,
- mode => '0770',
+ mode => '0770',
}
- file { "$basedir/dists":
+ file { "${basedir}/dists":
ensure => directory,
- mode => '0775',
+ mode => '0775',
}
- file { "$basedir/pool":
+ file { "${basedir}/pool":
ensure => directory,
- mode => '0775',
+ mode => '0775',
}
- file { "$basedir/incoming":
+ file { "${basedir}/incoming":
ensure => directory,
- mode => $incoming_mode,
+ mode => $incoming_mode,
}
- file { "$basedir/logs":
+ file { "${basedir}/logs":
ensure => directory,
- mode => '0775',
+ mode => '0775',
}
- file { "$basedir/tmp":
+ file { "${basedir}/tmp":
ensure => directory,
- mode => '0775',
+ mode => '0775',
}
- file { "$basedir/conf/uploaders":
- mode => '0660', owner => root,
- content => template("reprepro/uploaders.erb"),
+ file { "${basedir}/conf/uploaders":
+ mode => '0660', owner => root,
+ content => template('reprepro/uploaders.erb'),
}
- file { "$basedir/index.html":
- mode => '0664', owner => root,
- content => template("reprepro/index.html.erb"),
+ file { "${basedir}/index.html":
+ mode => '0664', owner => root,
+ content => template('reprepro/index.html.erb'),
}
- file { "$basedir/.gnupg":
+ file { "${basedir}/.gnupg":
ensure => directory,
- mode => '0700',
+ mode => '0700',
}
- file { "$basedir/.gnupg/secring.gpg":
+ file { "${basedir}/.gnupg/secring.gpg":
ensure => present,
- mode => '0600',
+ mode => '0600',
}
file { '/usr/local/bin/reprepro-export-key':
ensure => present,
@@ -90,46 +90,46 @@ class reprepro (
group => root,
mode => '0755',
}
- exec { "/usr/local/bin/reprepro-export-key":
- creates => "$basedir/key.asc",
+ exec { '/usr/local/bin/reprepro-export-key':
+ creates => "${basedir}/key.asc",
user => reprepro,
- subscribe => File["$basedir/.gnupg/secring.gpg"],
- require => File["/usr/local/bin/reprepro-export-key"],
+ subscribe => File["${basedir}/.gnupg/secring.gpg"],
+ require => File['/usr/local/bin/reprepro-export-key'],
}
- file { "$basedir/conf/distributions":
+ file { "${basedir}/conf/distributions":
ensure => present,
}
if $manage_distributions_conf {
- File["$basedir/conf/distributions"] {
+ File["${basedir}/conf/distributions"] {
owner => root,
mode => '0664',
- content => template("reprepro/distributions.erb"),
+ content => template('reprepro/distributions.erb'),
}
- exec { "reprepro -b $basedir createsymlinks":
+ exec { "reprepro -b ${basedir} createsymlinks":
refreshonly => true,
- subscribe => File["$basedir/conf/distributions"],
- user => reprepro,
- path => "/usr/bin:/bin",
+ subscribe => File["${basedir}/conf/distributions"],
+ user => reprepro,
+ path => '/usr/bin:/bin',
}
- exec { "reprepro -b $basedir export":
+ exec { "reprepro -b ${basedir} export":
refreshonly => true,
- user => reprepro,
- subscribe => File["$basedir/conf/distributions"],
- path => "/usr/bin:/bin",
+ user => reprepro,
+ subscribe => File["${basedir}/conf/distributions"],
+ path => '/usr/bin:/bin',
}
}
- file { "$basedir/conf/incoming":
+ file { "${basedir}/conf/incoming":
ensure => present,
}
if $manage_incoming_conf {
- File["$basedir/conf/incoming"] {
- mode => '0664',
- owner => root,
- source => "puppet:///modules/reprepro/incoming"
+ File["${basedir}/conf/incoming"] {
+ mode => '0664',
+ owner => root,
+ source => 'puppet:///modules/reprepro/incoming'
}
}
@@ -142,7 +142,7 @@ class reprepro (
cron { 'reprepro':
ensure => $cron_presence,
- command => "/usr/bin/reprepro --silent -b $basedir processincoming incoming",
+ command => "/usr/bin/reprepro --silent -b ${basedir} processincoming incoming",
user => reprepro,
minute => '*/5',
require => [ Package['reprepro'], File["$basedir/conf/distributions"],
diff --git a/manifests/lighty.pp b/manifests/lighty.pp
index 4e34f5e..3ac2bf4 100644
--- a/manifests/lighty.pp
+++ b/manifests/lighty.pp
@@ -1,11 +1,11 @@
class reprepro::lighty inherits lighttpd {
include reprepro
- file { "/etc/lighttpd/conf-available/20-reprepro.conf":
- ensure => present,
+ file { '/etc/lighttpd/conf-available/20-reprepro.conf':
+ ensure => present,
content => "alias.url += ( \"/debian/\" => \"$reprepro::basedir/\" )\n";
"/etc/lighttpd/conf-enabled/20-reprepro.conf":
- ensure => "/etc/lighttpd/conf-available/20-reprepro.conf",
+ ensure => '/etc/lighttpd/conf-available/20-reprepro.conf',
require => File['/etc/lighttpd/conf-available/20-reprepro.conf'],
- notify => Service['lighttpd'];
+ notify => Service['lighttpd'];
}
}