Jcrespo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/256458
Change subject: Fixing resource type error
......................................................................
Fixing resource type error
Change-Id: Iac3c9b9cd84f8257186a6ad4d61ef17c0eeb4648
---
M manifests/config.pp
M manifests/ssl_key.pp
2 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/mariadb
refs/changes/58/256458/1
diff --git a/manifests/config.pp b/manifests/config.pp
index bef17ae..602dc1d 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -92,19 +92,19 @@
require => File['/etc/mysql']
}
mariadb::ssl_key { 'cacert':
- file => 'cacert.pem',
+ filename => 'cacert.pem',
}
mariadb::ssl_key { 'server-key':
- file => 'server-key.pem',
+ filename => 'server-key.pem',
}
mariadb::ssl_key { 'server-cert':
- file => 'server-cert.pem',
+ filename => 'server-cert.pem',
}
mariadb::ssl_key { 'client-key':
- file => 'client-key.pem',
+ filename => 'client-key.pem',
}
mariadb::ssl_key { 'client-cert':
- file => 'client-cert.pem',
+ filename => 'client-cert.pem',
}
}
}
diff --git a/manifests/ssl_key.pp b/manifests/ssl_key.pp
index e378617..bbfa238 100644
--- a/manifests/ssl_key.pp
+++ b/manifests/ssl_key.pp
@@ -1,12 +1,12 @@
-class mariadb::ssl_key ($file) {
- file { "/etc/mysql/ssl/${file}":
+class mariadb::ssl_key ($filename) {
+ file { "/etc/mysql/ssl/${filename}":
ensure => file,
owner => 'root',
group => 'mysql',
mode => '0440',
show_diff => false,
backup => false,
- content => secret("mysql/${file}"),
+ content => secret("mysql/${filename}"),
require => File['/etc/mysql/ssl'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/256458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac3c9b9cd84f8257186a6ad4d61ef17c0eeb4648
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/mariadb
Gerrit-Branch: master
Gerrit-Owner: Jcrespo <jcre...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
