From ab03f8937dbc73d53ee617d2ac584bf07afca0a9 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 9 Jun 2018 15:36:59 -0300
Subject: APT: use https for deb-src and use log file for hydra update method

---
 manifests/subsystem/apt.pp            | 3 +--
 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
-- 
cgit v1.2.3