Merge pull request #180 from mhyzon/master

Allow managing backup cron w/o managing the config file
voxpupuli · Mar 8, 2018 · 4d8d21b · 4d8d21b
2 parents e9d8d28 + 039a840
commit 4d8d21b
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -76,11 +76,11 @@
   $backup_cron_enable = $::gitlab::backup_cron_enable
   $backup_cron_minute = $::gitlab::backup_cron_minute
   $backup_cron_hour = $::gitlab::backup_cron_hour
-  if empty($::gitlab::backup_cron_hour) {
+  if empty($::gitlab::backup_cron_skips) {
     $backup_cron_skips = ''
   } else {
     $_backup_cron_skips = join($::gitlab::backup_cron_skips, ',')
-    $backup_cron_skips = "SKIP:${_backup_cron_skips}"
+    $backup_cron_skips = "SKIP=${_backup_cron_skips}"
   }
 
   # replicate $nginx to $mattermost_nginx if $mattermost_nginx_eq_nginx true
@@ -136,8 +136,10 @@
 
   if $service_manage {
     # configure gitlab using the official tool
-    File[$config_file] {
-      notify => Exec['gitlab_reconfigure']
+    if $config_manage {
+      File[$config_file] {
+        notify => Exec['gitlab_reconfigure']
+      }
     }
     if ! empty($secrets) {
       File[$secrets_file] {