diff --git a/manifests/init.pp b/manifests/init.pp index 7d9e1b92dd7351d23dbc0fb48d8d49218d795ecd..3bc6c3729eeda1d201f1630320db4dcecd52b9ab 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -127,7 +127,7 @@ class aim_control ( source => 'git@gitlab.liu.se:aim-control/laravel.git', user => 'apache', group => 'skadereg', - require => File['/var/www/skadereg/'], # Ensure directory is created first + require => File['/var/www/skadereg/'], } apache::vhost { 'default:80': @@ -157,7 +157,7 @@ class aim_control ( directoryindex => 'index.php', } ], - require => Vcsrepo['/var/www/skadereg'], # Ensure VCS repo is checked out first + require => Vcsrepo['/var/www/skadereg'], } file { '/var/www/skadereg/.env': @@ -166,7 +166,7 @@ class aim_control ( group => 'skadereg', mode => '0660', content => template("${module_name}/dotenv.erb"), - require => Vcsrepo['/var/www/skadereg'], # Ensure VCS repo is checked out first + require => Vcsrepo['/var/www/skadereg'], } exec { 'artisan migrate': @@ -198,13 +198,12 @@ class aim_control ( 'mysqld' => { 'bind-address' => '0.0.0.0', 'port' => 33060, - 'socket' => '/var/lib/mysql/mysql.sock', # Add socket path explicitly if needed + 'socket' => '/var/lib/mysql/mysql.sock', }, }, - restart => true, # Ensure server restarts to apply configuration changes + restart => true, } - # Create the database with the necessary charset mysql::db { $db_name: user => $skadereg_ro_user, password => $skadereg_ro_password, @@ -213,7 +212,6 @@ class aim_control ( grant => ['SELECT'], } - # Create the root user with full privileges mysql_user { 'root@%': ensure => 'present', password_hash => mysql_password($mysql_password), @@ -246,4 +244,12 @@ class aim_control ( backuprotate => '7', time => ['1','0'], } + + # Setting permissions for /var/lib/mysql to ensure it's accessible + file { '/var/lib/mysql': + ensure => 'directory', + owner => 'mysql', + group => 'mysql', + mode => '0755', + } }