diff --git a/manifests/config.pp b/manifests/config.pp index 5b84f18..a40572b 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -28,6 +28,10 @@ true => '--download-metadata', false => '', } + $delete_old_option = $mirror_repos::delete_old ? { + true => '--delete', + false => '', + } #copy file to update repos to localhost file { '/usr/sbin/update-repos': ensure => file, diff --git a/manifests/init.pp b/manifests/init.pp index 85e91c9..5485141 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -48,6 +48,7 @@ Boolean $manage_vhost = $mirror_repos::params::manage_vhost, Array $createrepo_options = $mirror_repos::params::createrepo_options, Boolean $download_metadata = $mirror_repos::params::download_metadata, + Boolean $delete_old = $mirror_repos::params::delete_old, Boolean $legacy_cron = $mirror_repos::params::legacy_cron, String $cron_minute = $mirror_repos::params::cron_minute, String $cron_hour = $mirror_repos::params::cron_hour, diff --git a/manifests/params.pp b/manifests/params.pp index 8daf7bf..f26ee36 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -10,6 +10,7 @@ $repos = {} $createrepo_options = [] $download_metadata = false + $delete_old = false $legacy_cron = false $cron_minute = '0' $cron_hour = '1' diff --git a/templates/update-repos.sh.erb b/templates/update-repos.sh.erb index 13ceed6..8a527b3 100644 --- a/templates/update-repos.sh.erb +++ b/templates/update-repos.sh.erb @@ -56,10 +56,10 @@ main(){ $REPOSYNC_CMD -q -l -c $CONFIG_DIR/$OS.conf --repoid=$REPO --download_path=$REPOS_DIR/$OS/ <% end -%> <% if @operatingsystemmajrelease == '7' -%> - $REPOSYNC_CMD -q -l -c $CONFIG_DIR/$OS.conf --repoid=$REPO --download_path=$REPOS_DIR/$OS/ <%= @download_metadata_option -%> + $REPOSYNC_CMD -q -l -c $CONFIG_DIR/$OS.conf --repoid=$REPO --download_path=$REPOS_DIR/$OS/ <%= @download_metadata_option -%> <%= @delete_old_option %> <% end -%> <% if @operatingsystemmajrelease == '8' -%> - $REPOSYNC_CMD -q -c $CONFIG_DIR/$OS.conf --repoid=$REPO --download-path=$REPOS_DIR/$OS/ <%= @download_metadata_option -%> + $REPOSYNC_CMD -q -c $CONFIG_DIR/$OS.conf --repoid=$REPO --download-path=$REPOS_DIR/$OS/ <%= @download_metadata_option -%> <%= @delete_old_option %> <% end -%> #create yum repository from local synced directories