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

Merge branch 'update_init' into 'devel'

Uncommenting mysql

See merge request !50
parents 37f7167e f9cf5e4a
No related branches found
No related tags found
3 merge requests!67Test,!66Devel,!50Uncommenting mysql
Pipeline #131309 passed
This commit is part of merge request !67. Comments created here will be created in the context of that merge request.
...@@ -187,38 +187,38 @@ class aim_control ( ...@@ -187,38 +187,38 @@ class aim_control (
# command => 'php /var/www/skadereg/artisan schedule:run &> /dev/null', # command => 'php /var/www/skadereg/artisan schedule:run &> /dev/null',
# } # }
# $db_name = 'homestead' $db_name = 'homestead'
# class { 'mysql::server': class { 'mysql::server':
# root_password => $mysql_password, root_password => $mysql_password,
# databases => { databases => {
# $db_name => { $db_name => {
# ensure => present, ensure => present,
# charset => 'utf8', charset => 'utf8',
# }, },
# }, },
# users => { users => {
# "${skadereg_ro_user}@%" => { "${skadereg_ro_user}@%" => {
# ensure => present, ensure => present,
# password_hash => mysql_password($skadereg_ro_password), password_hash => mysql_password($skadereg_ro_password),
# }, },
# }, },
# grants => { grants => {
# 'root@%/*.*' => { 'root@%/*.*' => {
# ensure => present, ensure => present,
# options => ['GRANT'], options => ['GRANT'],
# privileges => ['ALL'], privileges => ['ALL'],
# table => '*.*', table => '*.*',
# user => 'root@%', user => 'root@%',
# }, },
# }, },
# override_options => { override_options => {
# mysqld => { mysqld => {
# 'bind-address' => '0.0.0.0', 'bind-address' => '0.0.0.0',
# port => 33060, port => 33060,
# }, },
# }, },
# } }
# ['entries', 'guardian_confirmations', 'users'].each |String $table| { # ['entries', 'guardian_confirmations', 'users'].each |String $table| {
# mysql_grant { "${skadereg_ro_user}@%/${db_name}.${table}": # mysql_grant { "${skadereg_ro_user}@%/${db_name}.${table}":
......
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