Commit 873152e5 authored by Hugo Hörnquist's avatar Hugo Hörnquist
Browse files

Minor cleanup.

parent de024abd
...@@ -10,15 +10,15 @@ class datorhandbok ( ...@@ -10,15 +10,15 @@ class datorhandbok (
{ ensure => installed, }) { ensure => installed, })
service { 'apache2': service { 'apache2':
ensure => running, ensure => running,
enable => true, enable => true,
require => Package['apache2'], require => Package['apache2'],
} }
service { 'mysql': service { 'mysql':
ensure => running, ensure => running,
enable => true, enable => true,
require => Package['default-mysql-server'], require => Package['default-mysql-server'],
} }
...@@ -47,10 +47,10 @@ class datorhandbok ( ...@@ -47,10 +47,10 @@ class datorhandbok (
} }
user { 'mysql': user { 'mysql':
ensure => present, ensure => present,
system => true, system => true,
gid => 'mysql', gid => 'mysql',
home => '/var/lib/mysql', home => '/var/lib/mysql',
} }
file { '/var/lib/mysql': file { '/var/lib/mysql':
...@@ -129,6 +129,9 @@ class datorhandbok ( ...@@ -129,6 +129,9 @@ class datorhandbok (
group => www-data, group => www-data,
mode => '0440', mode => '0440',
content => epp('datorhandbok/LocalSettings.php', content => epp('datorhandbok/LocalSettings.php',
# Wrapping $mysql_password in Sensitive() would prevent it from
# showing up in logs, but the file then contained
# "Sensitive [value redacted]"...
{ 'mysql_password' => $mysql_password }), { 'mysql_password' => $mysql_password }),
require => Package['mediawiki'], require => Package['mediawiki'],
} }
...@@ -137,7 +140,7 @@ class datorhandbok ( ...@@ -137,7 +140,7 @@ class datorhandbok (
ensure => file, ensure => file,
owner => www-data, owner => www-data,
group => www-data, group => www-data,
source => "puppet:///modules/datorhandbok/lyslogo-liten.png", source => 'puppet:///modules/datorhandbok/lyslogo-liten.png',
require => Package['mediawiki'], require => Package['mediawiki'],
} }
...@@ -145,7 +148,7 @@ class datorhandbok ( ...@@ -145,7 +148,7 @@ class datorhandbok (
ensure => file, ensure => file,
owner => root, owner => root,
group => root, group => root,
source => "puppet:///modules/datorhandbok/favicon.ico", source => 'puppet:///modules/datorhandbok/favicon.ico',
require => Package['mediawiki'], require => Package['mediawiki'],
} }
......
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