[MediaWiki-commits] [Gerrit] Getting rid of separate class - change (operations...mariadb)

2015-12-02 Thread Jcrespo (Code Review) 
Jcrespo has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/256468

Change subject: Getting rid of separate class
..

Getting rid of separate class

Change-Id: I5a0cd5f7e4bd76ae178c675d195caa43c3011e06
---
M manifests/config.pp
D manifests/ssl_key.pp
2 files changed, 45 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/mariadb 
refs/changes/68/256468/1

diff --git a/manifests/config.pp b/manifests/config.pp
index 9d3ec46..d8034c3 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -91,20 +91,55 @@
 mode=> '0750',
 require => File['/etc/mysql']
 }
-ssl_key { 'cacert':
-filename => 'cacert.pem',
+file { '/etc/mysql/ssl/cacert.pem':
+ensure=> file,
+owner => 'root',
+group => 'mysql',
+mode  => '0440',
+show_diff => false,
+backup=> false,
+content   => secret("mysql/cacert.pem"),
+require   => File['/etc/mysql/ssl'],
 }
-ssl_key { 'server-key':
-filename => 'server-key.pem',
+file { '/etc/mysql/ssl/server-key.pem':
+ensure=> file,
+owner => 'root',
+group => 'mysql',
+mode  => '0440',
+show_diff => false,
+backup=> false,
+content   => secret("mysql/server-key.pem"),
+require   => File['/etc/mysql/ssl'],
 }
-ssl_key { 'server-cert':
-filename => 'server-cert.pem',
+file { '/etc/mysql/ssl/server-cert.pem':
+ensure=> file,
+owner => 'root',
+group => 'mysql',
+mode  => '0440',
+show_diff => false,
+backup=> false,
+content   => secret("mysql/server-cert.pem"),
+require   => File['/etc/mysql/ssl'],
 }
-ssl_key { 'client-key':
-filename => 'client-key.pem',
+file { '/etc/mysql/ssl/client-key.pem':
+ensure=> file,
+owner => 'root',
+group => 'mysql',
+mode  => '0440',
+show_diff => false,
+backup=> false,
+content   => secret("mysql/client-key.pem"),
+require   => File['/etc/mysql/ssl'],
 }
-ssl_key { 'client-cert':
-filename => 'client-cert.pem',
+file { '/etc/mysql/ssl/client-cert.pem':
+ensure=> file,
+owner => 'root',
+group => 'mysql',
+mode  => '0440',
+show_diff => false,
+backup=> false,
+content   => secret("mysql/client-cert.pem"),
+require   => File['/etc/mysql/ssl'],
 }
 }
 }
diff --git a/manifests/ssl_key.pp b/manifests/ssl_key.pp
deleted file mode 100644
index bbfa238..000
--- a/manifests/ssl_key.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-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/${filename}"),
-require   => File['/etc/mysql/ssl'],
-}
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/256468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a0cd5f7e4bd76ae178c675d195caa43c3011e06
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/mariadb
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Getting rid of separate class - change (operations...mariadb)

2015-12-02 Thread Jcrespo (Code Review) 
Jcrespo has submitted this change and it was merged.

Change subject: Getting rid of separate class
..


Getting rid of separate class

Change-Id: I5a0cd5f7e4bd76ae178c675d195caa43c3011e06
---
M manifests/config.pp
D manifests/ssl_key.pp
2 files changed, 45 insertions(+), 22 deletions(-)

Approvals:
  Jcrespo: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/config.pp b/manifests/config.pp
index 9d3ec46..d8034c3 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -91,20 +91,55 @@
 mode=> '0750',
 require => File['/etc/mysql']
 }
-ssl_key { 'cacert':
-filename => 'cacert.pem',
+file { '/etc/mysql/ssl/cacert.pem':
+ensure=> file,
+owner => 'root',
+group => 'mysql',
+mode  => '0440',
+show_diff => false,
+backup=> false,
+content   => secret("mysql/cacert.pem"),
+require   => File['/etc/mysql/ssl'],
 }
-ssl_key { 'server-key':
-filename => 'server-key.pem',
+file { '/etc/mysql/ssl/server-key.pem':
+ensure=> file,
+owner => 'root',
+group => 'mysql',
+mode  => '0440',
+show_diff => false,
+backup=> false,
+content   => secret("mysql/server-key.pem"),
+require   => File['/etc/mysql/ssl'],
 }
-ssl_key { 'server-cert':
-filename => 'server-cert.pem',
+file { '/etc/mysql/ssl/server-cert.pem':
+ensure=> file,
+owner => 'root',
+group => 'mysql',
+mode  => '0440',
+show_diff => false,
+backup=> false,
+content   => secret("mysql/server-cert.pem"),
+require   => File['/etc/mysql/ssl'],
 }
-ssl_key { 'client-key':
-filename => 'client-key.pem',
+file { '/etc/mysql/ssl/client-key.pem':
+ensure=> file,
+owner => 'root',
+group => 'mysql',
+mode  => '0440',
+show_diff => false,
+backup=> false,
+content   => secret("mysql/client-key.pem"),
+require   => File['/etc/mysql/ssl'],
 }
-ssl_key { 'client-cert':
-filename => 'client-cert.pem',
+file { '/etc/mysql/ssl/client-cert.pem':
+ensure=> file,
+owner => 'root',
+group => 'mysql',
+mode  => '0440',
+show_diff => false,
+backup=> false,
+content   => secret("mysql/client-cert.pem"),
+require   => File['/etc/mysql/ssl'],
 }
 }
 }
diff --git a/manifests/ssl_key.pp b/manifests/ssl_key.pp
deleted file mode 100644
index bbfa238..000
--- a/manifests/ssl_key.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-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/${filename}"),
-require   => File['/etc/mysql/ssl'],
-}
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/256468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a0cd5f7e4bd76ae178c675d195caa43c3011e06
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/mariadb
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits