Commit 7d140e03 authored by taggart's avatar taggart
Browse files

fix structure of classes to be standard, lint

parent 99f14226
......@@ -51,10 +51,3 @@ class sympa::debian (
package { "sympa": ensure => installed; }
}
}
class sympa::samilter::debian {
package {
"spamass-milter":
ensure => installed;
}
}
# FIXME: maybe this shouldn't be in the sympa class?
class sympa::samilter {
case $operatingsystem {
debian: { include sympa::samilter::debian }
default: { include sympa::samilter::default }
}
file {
"/var/run/sendmail":
ensure => directory,
mode => 0777, owner => postfix, group => postfix;
"/var/run/spamass/spamass.sock":
ensure => present,
mode => 0755, owner => postfix, group => postfix;
# FIXME: is /etc/default debian specific? fix if yes
"/etc/default/spamass-milter":
source => "${::fileserver}/spamassassin/spamass-milter_default",
require => Package["spamass-milter"],
mode => 0644, owner => root, group => root;
}
service {
"spamass-milter":
name => spamass-milter,
pattern => '/usr/sbin/spamass-milter',
enable => true,
ensure => running,
hasrestart => true,
subscribe => File["/etc/default/spamass-milter"],
require => File["/etc/default/spamass-milter"];
}
}
class sympa::samilter {
case $::operatingsystem {
debian: { include sympa::samilter::debian }
default: { include sympa::samilter::default }
}
file {
'/var/run/sendmail':
ensure => directory,
mode => '0777',
owner => postfix,
group => postfix;
'/var/run/spamass/spamass.sock':
ensure => present,
mode => '0755',
owner => postfix,
group => postfix;
# FIXME: is /etc/default debian specific? fix if yes
'/etc/default/spamass-milter':
source => "${::fileserver}/spamassassin/spamass-milter_default",
require => Package['spamass-milter'],
mode => '0644',
owner => root,
group => root;
}
service {
'spamass-milter':
ensure => running,
name => spamass-milter,
pattern => '/usr/sbin/spamass-milter',
enable => true,
hasrestart => true,
subscribe => File['/etc/default/spamass-milter'],
require => File['/etc/default/spamass-milter'];
}
}
class sympa::samilter::debian {
package {
"spamass-milter":
ensure => installed;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment