APT: use https for deb-src and use log file for hydra update method

diff --git a/manifests/subsystem/apt.pp b/manifests/subsystem/apt.pp
index 78dbcbff8d42831c3215a85d51462ae1ba332e4d..002f0c164403e13944188643ff92fb5e54c10c9b 100644 (file)
--- 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 887e940da3991a8c046688c8686ee43bac62fc4b..e8c1d804b286dfc5f113e17b8235b42e5a758046 100644 (file)
--- 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