Merge pull request #1425 from markasammut/main

Solve issue with repeated restarts if ssl-disable is true

Author: LukasAud

manifests/server.pp

@@ -167,6 +167,14 @@
     ~> Class['mysql::server::service']
   }
 
+
+  if $_options['mysqld']['ssl-disable'] {
+    notify { 'ssl-disable':
+      message => 'Disabling SSL is evil! You should never ever do this except
+                if you are forced to use a mysql version compiled without SSL support',
+    }
+  }
+
   Anchor['mysql::server::start']
   -> Class['mysql::server::config']
   -> Class['mysql::server::install']
@@ -175,4 +183,5 @@
   -> Class['mysql::server::service']
   -> Class['mysql::server::root_password']
   -> Class['mysql::server::providers']
--> Anchor['mysql::server::end'] }
+  -> Anchor['mysql::server::end']
+}

manifests/server/config.pp

@@ -82,11 +82,4 @@
       }
     }
   }
-
-  if $options['mysqld']['ssl-disable'] {
-    notify { 'ssl-disable':
-      message => 'Disabling SSL is evil! You should never ever do this except
-                if you are forced to use a mysql version compiled without SSL support',
-    }
-  }
 }