Skip to content
Snippets Groups Projects
Commit 3569d8a4 authored by Hugo Hörnquist's avatar Hugo Hörnquist
Browse files

Fix lint errors.

parent 8da80fc6
No related branches found
No related tags found
No related merge requests found
...@@ -7,9 +7,9 @@ define irc_bouncer::module ( ...@@ -7,9 +7,9 @@ define irc_bouncer::module (
$arg_str = join($args, ' ') $arg_str = join($args, ' ')
file_line { "ZNC module ${module}": file_line { "ZNC module ${module}":
path => '/var/lib/znc/configs/znc.conf',
ensure => present, ensure => present,
match => "^LoadModule = ${module}", path => '/var/lib/znc/configs/znc.conf',
line => "LoadModule = ${module} ${arg_str}" match => "^LoadModule = ${module}",
line => "LoadModule = ${module} ${arg_str}"
} }
} }
...@@ -12,23 +12,23 @@ class irc_bouncer::setup { ...@@ -12,23 +12,23 @@ class irc_bouncer::setup {
{ ensure => installed, }) { ensure => installed, })
file_line { 'saslauthd remove START=no': file_line { 'saslauthd remove START=no':
path => '/etc/default/saslauthd', ensure => absent,
line => 'START=no', path => '/etc/default/saslauthd',
ensure => absent, line => 'START=no',
require => Package['sasl2-bin'], require => Package['sasl2-bin'],
} }
file_line { 'saslauthd START=yes': file_line { 'saslauthd START=yes':
path => '/etc/default/saslauthd', ensure => present,
line => 'START=yes', path => '/etc/default/saslauthd',
ensure => present, line => 'START=yes',
require => Package['sasl2-bin'], require => Package['sasl2-bin'],
} }
file_line { 'saslauthd pam': file_line { 'saslauthd pam':
path => '/etc/default/saslauthd', ensure => present,
line => 'MECHANISMS="pam"', path => '/etc/default/saslauthd',
ensure => present, line => 'MECHANISMS="pam"',
require => Package['sasl2-bin'], require => Package['sasl2-bin'],
} }
...@@ -37,35 +37,35 @@ class irc_bouncer::setup { ...@@ -37,35 +37,35 @@ class irc_bouncer::setup {
user { 'znc': user { 'znc':
comment => 'ZNC Daemon runner', comment => 'ZNC Daemon runner',
home => '/var/lib/znc', home => '/var/lib/znc',
system => true, system => true,
shell => '/usr/sbin/nologin', shell => '/usr/sbin/nologin',
groups => [ 'sasl', ], groups => [ 'sasl', ],
} }
file { '/var/lib/znc': file { '/var/lib/znc':
ensure => directory, ensure => directory,
owner => 'znc', owner => 'znc',
} }
vcsrepo { '/var/lib/znc/znc-lysator': vcsrepo { '/var/lib/znc/znc-lysator':
ensure => latest, ensure => latest,
provider => git, provider => git,
source => 'https://git.lysator.liu.se/hugo/znc-lysator', source => 'https://git.lysator.liu.se/hugo/znc-lysator',
revision => 'release', revision => 'release',
} ~> exec { 'build znc-lysator': } ~> exec { 'build znc-lysator':
cwd => '/var/lib/znc/znc-lysator', cwd => '/var/lib/znc/znc-lysator',
command => 'make', command => 'make',
path => '/usr/bin:/bin', path => '/usr/bin:/bin',
} ~> file { '/usr/lib/znc/lysconf.so': } ~> file { '/usr/lib/znc/lysconf.so':
ensure => present, ensure => present,
source => '/var/lib/znc/znc-lysator/lysconf.so', source => '/var/lib/znc/znc-lysator/lysconf.so',
} }
file { '/var/lib/znc/configs/znc.conf': file { '/var/lib/znc/configs/znc.conf':
ensure => present, ensure => present,
replace => no, replace => no,
source => 'puppet:///modules/irc_bouncer/znc.conf', source => 'puppet:///modules/irc_bouncer/znc.conf',
owner => 'znc', owner => 'znc',
} }
irc_bouncer::module { [ 'webadmin', irc_bouncer::module { [ 'webadmin',
...@@ -78,13 +78,13 @@ class irc_bouncer::setup { ...@@ -78,13 +78,13 @@ class irc_bouncer::setup {
exec { 'znc make pem': exec { 'znc make pem':
command => 'znc --datadir=/var/lib/znc --makepem', command => 'znc --datadir=/var/lib/znc --makepem',
path => '/usr/bin:/bin', path => '/usr/bin:/bin',
user => 'znc', user => 'znc',
onlyif => 'test ! -f /var/lib/znc/znc.pem', onlyif => 'test ! -f /var/lib/znc/znc.pem',
} }
file { '/var/lib/znc/moddata/cyrusauth/.registry': file { '/var/lib/znc/moddata/cyrusauth/.registry':
ensure => file, ensure => file,
content => "CreateUser true\n", content => "CreateUser true\n",
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment