Thcipriani has uploaded a new change for review.

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

Change subject: Add /etc/mysql dir before linking inside it
......................................................................

Add /etc/mysql dir before linking inside it

Add a file resource for /etc/mysql and require that resource before
linking /etc/my.cnf to /etc/mysql/my.cnf. Link will fail if /etc/mysql
does not exist.

Change-Id: Idf2d87606a58ee993c235e59dd7d03404b5f1285
---
M manifests/config.pp
1 file changed, 10 insertions(+), 0 deletions(-)


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

diff --git a/manifests/config.pp b/manifests/config.pp
index ec56643..f4553f6 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -29,9 +29,19 @@
         content => template('mariadb/root.my.cnf.erb'),
     }
 
+    if ! defined(File['/etc/mysql']) {
+        file { '/etc/mysql':
+            ensure => directory,
+            mode   => '0755',
+            owner  => 'root',
+            group  => 'root',
+        }
+    }
+
     file { '/etc/mysql/my.cnf':
         ensure => link,
         target => '/etc/my.cnf',
+        require => File['/etc/mysql'],
     }
 
     # Include these manually. If we're testing on systems with tarballs

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idf2d87606a58ee993c235e59dd7d03404b5f1285
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/mariadb
Gerrit-Branch: master
Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org>

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

Reply via email to