Skip to content
Snippets Groups Projects
Commit b2a3ac0b authored by Andreas Alvarsson's avatar Andreas Alvarsson
Browse files

Merge branch 'mysql' into 'production'

Add MySQL

See merge request !3
parents bba077f6 db024287
No related branches found
No related tags found
1 merge request!2Merge till Production
...@@ -52,6 +52,7 @@ class skadereg { ...@@ -52,6 +52,7 @@ class skadereg {
} }
include skadereg::firewall include skadereg::firewall
include ::yum::centos_scl
include ::apache include ::apache
class { '::apache::mod::php': class { '::apache::mod::php':
...@@ -65,8 +66,6 @@ class skadereg { ...@@ -65,8 +66,6 @@ class skadereg {
'php55-php-common': ensure => installed; 'php55-php-common': ensure => installed;
} }
file { '/etc/httpd/modules/libphp5.so': file { '/etc/httpd/modules/libphp5.so':
ensure => link, ensure => link,
target => '/opt/rh/httpd24/root/usr/lib64/httpd/modules/libphp55-php5.so', target => '/opt/rh/httpd24/root/usr/lib64/httpd/modules/libphp55-php5.so',
...@@ -122,13 +121,18 @@ class skadereg { ...@@ -122,13 +121,18 @@ class skadereg {
user => 'andal699' user => 'andal699'
} }
include ::yum::centos_scl class { '::mysql::server':
root_password => 'ControlAvHandboll',
file { '/tmp/example': databases => {
ensure => file, 'homestead' => {
content => template('skadereg/example.erb'), ensure => present,
owner => andal699, charset => 'utf8',
group => andal699, }
mode => '0400', },
override_options => {
mysqld => {
port => 33060
}
}
} }
} }
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