Skip to content

Commit

Permalink
I think there were some minor problems with #155. This allows managin…
Browse files Browse the repository at this point in the history
…g the backup cron w/o managing the config file and fixing SKIP syntax.
  • Loading branch information
Moshe Hyzon committed Jan 12, 2018
1 parent cc14f11 commit 039a840
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,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
Expand Down Expand Up @@ -135,8 +135,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] {
Expand Down

0 comments on commit 039a840

Please sign in to comment.