diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2018-06-09 15:36:59 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2018-06-09 15:36:59 -0300 |
| commit | ab03f8937dbc73d53ee617d2ac584bf07afca0a9 (patch) | |
| tree | b7bf500d313f8218c019f067ec22d2cf64a34a9b | |
| parent | 86699b71bc0ce457c1e1bdc95392c866ec9d07c4 (diff) | |
| download | puppet-nodo-ab03f8937dbc73d53ee617d2ac584bf07afca0a9.tar.gz puppet-nodo-ab03f8937dbc73d53ee617d2ac584bf07afca0a9.tar.bz2 | |
APT: use https for deb-src and use log file for hydra update method
| -rw-r--r-- | manifests/subsystem/apt.pp | 3 | ||||
| -rw-r--r-- | templates/apt/Debian.sources.list.erb | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/manifests/subsystem/apt.pp b/manifests/subsystem/apt.pp index 78dbcbf..002f0c1 100644 --- a/manifests/subsystem/apt.pp +++ b/manifests/subsystem/apt.pp @@ -41,8 +41,7 @@ class nodo::subsystem::apt( $command = "${apt} update ${log} && ${apt} dist-upgrade -y ${log} && ${apt} autoremove -y ${log} && ${apt} clean ${log}" } elsif $upgrade_handler == 'hydra' { - #$command = "hydractl upgrade clean ${log}" - $command = "hydractl upgrade clean" + $command = "hydractl upgrade clean ${log}" } exec { 'nodo-apt-auto-update': diff --git a/templates/apt/Debian.sources.list.erb b/templates/apt/Debian.sources.list.erb index 887e940..e8c1d80 100644 --- a/templates/apt/Debian.sources.list.erb +++ b/templates/apt/Debian.sources.list.erb @@ -5,11 +5,11 @@ # basic deb <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %> main contrib non-free -deb-src http://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %> main contrib non-free +deb-src https://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %> main contrib non-free # updates deb <%= @mirror %>/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-updates main contrib non-free -deb-src http://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-updates main contrib non-free +deb-src https://deb.debian.org/debian/ <%= scope.lookupvar('::lsbdistcodename') %>-updates main contrib non-free # security deb http://security.debian.org/ <%= scope.lookupvar('::lsbdistcodename') %>/updates main contrib non-free |