Skip to content
Snippets Groups Projects
Commit be306d40 authored by Saga Norén Karlsson's avatar Saga Norén Karlsson
Browse files

Merge branch 'update_init' into 'devel'

Changing permissions for mysql directory

See merge request !63
parents 5d9d53c7 1cd01995
No related branches found
No related tags found
3 merge requests!67Test,!66Devel,!63Changing permissions for mysql directory
Pipeline #131915 passed
...@@ -127,7 +127,7 @@ class aim_control ( ...@@ -127,7 +127,7 @@ class aim_control (
source => 'git@gitlab.liu.se:aim-control/laravel.git', source => 'git@gitlab.liu.se:aim-control/laravel.git',
user => 'apache', user => 'apache',
group => 'skadereg', group => 'skadereg',
require => File['/var/www/skadereg/'], # Ensure directory is created first require => File['/var/www/skadereg/'],
} }
apache::vhost { 'default:80': apache::vhost { 'default:80':
...@@ -157,7 +157,7 @@ class aim_control ( ...@@ -157,7 +157,7 @@ class aim_control (
directoryindex => 'index.php', 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': file { '/var/www/skadereg/.env':
...@@ -166,7 +166,7 @@ class aim_control ( ...@@ -166,7 +166,7 @@ class aim_control (
group => 'skadereg', group => 'skadereg',
mode => '0660', mode => '0660',
content => template("${module_name}/dotenv.erb"), 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': exec { 'artisan migrate':
...@@ -198,13 +198,12 @@ class aim_control ( ...@@ -198,13 +198,12 @@ class aim_control (
'mysqld' => { 'mysqld' => {
'bind-address' => '0.0.0.0', 'bind-address' => '0.0.0.0',
'port' => 33060, '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: mysql::db { $db_name:
user => $skadereg_ro_user, user => $skadereg_ro_user,
password => $skadereg_ro_password, password => $skadereg_ro_password,
...@@ -213,7 +212,6 @@ class aim_control ( ...@@ -213,7 +212,6 @@ class aim_control (
grant => ['SELECT'], grant => ['SELECT'],
} }
# Create the root user with full privileges
mysql_user { 'root@%': mysql_user { 'root@%':
ensure => 'present', ensure => 'present',
password_hash => mysql_password($mysql_password), password_hash => mysql_password($mysql_password),
...@@ -246,4 +244,12 @@ class aim_control ( ...@@ -246,4 +244,12 @@ class aim_control (
backuprotate => '7', backuprotate => '7',
time => ['1','0'], 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',
}
} }
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