From 3c30babe255aa156d9f1d284d1279aed55a8353d Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Tue, 15 Nov 2016 14:15:44 +0100
Subject: [PATCH] MySQL password from hiera
---
manifests/init.pp | 46 +++++++++++++++++++++++++++++++---------------
1 file changed, 31 insertions(+), 15 deletions(-)
diff --git a/manifests/init.pp b/manifests/init.pp
index ade3124..393bc95 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -44,7 +44,9 @@
#
-class skadereg {
+class skadereg(
+ $mysql_password
+){
::users::liu_user { 'andal699':
commonname => 'Andreas Alvarsson',
shell => '/bin/bash',
@@ -60,10 +62,15 @@ class skadereg {
}
include ::apache::mod::rewrite
- package { 'php55-php-pdo':
- ensure => installed;
- 'php55-php-mbstring': ensure => installed;
- 'php55-php-common': ensure => installed;
+ package {
+ 'php55-php-pdo':
+ ensure => installed;
+ 'php55-php-mbstring':
+ ensure => installed;
+ 'php55-php-mysqlnd':
+ ensure => installed;
+ 'php55-php-common':
+ ensure => installed;
}
file { '/etc/httpd/modules/libphp5.so':
@@ -106,19 +113,19 @@ class skadereg {
}
file { '/var/www/skadereg/':
- ensure => directory,
- owner => 'andal699',
- group => 'apache',
- mode => '0770',
+ ensure => directory,
+ owner => 'andal699',
+ group => 'apache',
+ mode => '0770',
recurse => true
}->
vcsrepo { '/var/www/skadereg':
- ensure => latest,
- before => File['/var/www/skadereg/public'],
+ ensure => latest,
+ before => File['/var/www/skadereg/public'],
provider => git,
- source => 'ssh://git@gitlab.it.liu.se:29418/andal699/laravel.git',
- user => 'andal699'
+ source => 'ssh://git@gitlab.it.liu.se:29418/andal699/laravel.git',
+ user => 'andal699'
}->
file { '/var/www/skadereg/.env':
@@ -130,13 +137,22 @@ class skadereg {
}
class { '::mysql::server':
- root_password => 'ControlAvHandboll',
+ root_password => $mysql_password,
databases => {
'homestead' => {
ensure => present,
charset => 'utf8',
}
},
+ grants => {
+ 'root' => {
+ ensure => present,
+ options => ['GRANT'],
+ privileges => ['SELECT', 'INSERT', 'UPDATE', 'DELETE'],
+ table => '*.*',
+ user => "'root'@'%'",
+ }
+ },
override_options => {
mysqld => {
'bind-address' => '0.0.0.0',
@@ -144,4 +160,4 @@ class skadereg {
}
}
}
-}
\ No newline at end of file
+}
--
GitLab