[tor-bugs] #33277 [Internal Services/Tor Sysadmin Team]: adopt puppetlabs apt module
Tor Bug Tracker & Wiki
blackhole at torproject.org
Tue Feb 11 22:51:30 UTC 2020
#33277: adopt puppetlabs apt module
-------------------------------------------------+-------------------------
Reporter: anarcat | Owner: anarcat
Type: task | Status: closed
Priority: Low | Milestone:
Component: Internal Services/Tor Sysadmin Team | Version:
Severity: Major | Resolution: fixed
Keywords: tpa-roadmap-february | Actual Points: 0.5
Parent ID: | Points: 1
Reviewer: | Sponsor:
-------------------------------------------------+-------------------------
Comment (by anarcat):
for what it's worth, this is the actual final diff on a host like pauli:
{{{
diff --git a/apt/apt.conf.d/15update-stamp b/apt/apt.conf.d/15update-stamp
new file mode 100644
index 00000000..d818d2dd
--- /dev/null
+++ b/apt/apt.conf.d/15update-stamp
@@ -0,0 +1,2 @@
+// This file is managed by Puppet. DO NOT EDIT.
+APT::Update::Post-Invoke-Success {"touch /var/lib/apt/periodic/update-
success-stamp 2>/dev/null || true";};
diff --git a/apt/apt.conf.d/60https-db-torproject-org-x509
b/apt/apt.conf.d/60https-db-torproject-org-x509
new file mode 100644
index 00000000..3c292c21
--- /dev/null
+++ b/apt/apt.conf.d/60https-db-torproject-org-x509
@@ -0,0 +1,2 @@
+// This file is managed by Puppet. DO NOT EDIT.
+Acquire::https::db.torproject.org::CaInfo "/usr/share/ca-
certificates/mozilla/DST_Root_CA_X3.crt";
\ No newline at end of file
diff --git a/apt/apt.conf.d/60no-recommends b/apt/apt.conf.d/60no-
recommends
new file mode 100644
index 00000000..a96b8742
--- /dev/null
+++ b/apt/apt.conf.d/60no-recommends
@@ -0,0 +1,2 @@
+// This file is managed by Puppet. DO NOT EDIT.
+APT::Install-Recommends 0;
\ No newline at end of file
diff --git a/apt/apt.conf.d/60pdiffs b/apt/apt.conf.d/60pdiffs
new file mode 100644
index 00000000..58fecbd6
--- /dev/null
+++ b/apt/apt.conf.d/60pdiffs
@@ -0,0 +1,2 @@
+// This file is managed by Puppet. DO NOT EDIT.
+Acquire::PDiffs "false";
\ No newline at end of file
diff --git a/apt/apt.conf.d/local-pdiffs b/apt/apt.conf.d/local-pdiffs
deleted file mode 100644
index 5fa0fc77..00000000
--- a/apt/apt.conf.d/local-pdiffs
+++ /dev/null
@@ -1,5 +0,0 @@
-//
-// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-//
-
-Acquire::PDiffs "false";
diff --git a/apt/apt.conf.d/local-recommends b/apt/apt.conf.d/local-
recommends
deleted file mode 100644
index ff0e86d0..00000000
--- a/apt/apt.conf.d/local-recommends
+++ /dev/null
@@ -1,5 +0,0 @@
-//
-// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-//
-
-APT::Install-Recommends 0;
diff --git a/apt/apt.conf.d/puppet-https-db b/apt/apt.conf.d/puppet-https-
db
deleted file mode 100644
index 28a359fb..00000000
--- a/apt/apt.conf.d/puppet-https-db
+++ /dev/null
@@ -1 +0,0 @@
-Acquire::https::db.torproject.org::CaInfo "/usr/share/ca-
certificates/mozilla/DST_Root_CA_X3.crt";
diff --git a/apt/sources.list.d/backports.debian.org.list
b/apt/sources.list.d/backports.debian.org.list
index 33cf3464..c8960e35 100644
--- a/apt/sources.list.d/backports.debian.org.list
+++ b/apt/sources.list.d/backports.debian.org.list
@@ -1,6 +1,3 @@
-##
-### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-###
-
-deb https://mirror.hetzner.de/debian/packages/ buster-backports
main contrib non-free
-deb https://deb.debian.org/debian/ buster-backports main
contrib non-free
+# This file is managed by Puppet. DO NOT EDIT.
+# backports.debian.org
+deb https://mirror.hetzner.de/debian/packages/ buster-backports main
contrib non-free
diff --git a/apt/sources.list.d/debian.list
b/apt/sources.list.d/debian.list
index 5621f25d..648b45a9 100644
--- a/apt/sources.list.d/debian.list
+++ b/apt/sources.list.d/debian.list
@@ -1,6 +1,3 @@
-##
-### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-###
-
-deb https://mirror.hetzner.de/debian/packages/ buster main
contrib non-free
-deb https://deb.debian.org/debian/ buster main contrib non-free
+# This file is managed by Puppet. DO NOT EDIT.
+# debian
+deb https://mirror.hetzner.de/debian/packages/ buster main contrib non-
free
diff --git a/apt/sources.list.d/security.list
b/apt/sources.list.d/security.list
index 1ebe9f98..b2292251 100644
--- a/apt/sources.list.d/security.list
+++ b/apt/sources.list.d/security.list
@@ -1,5 +1,3 @@
-##
-### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-###
-
-deb http://security.debian.org/ buster/updates main contrib non-
free
+# This file is managed by Puppet. DO NOT EDIT.
+# security
+deb http://security.debian.org/ buster/updates main contrib non-free
diff --git a/apt/sources.list.d/torproject.org.list
b/apt/sources.list.d/torproject.org.list
index d56a66eb..25c1f026 100644
--- a/apt/sources.list.d/torproject.org.list
+++ b/apt/sources.list.d/torproject.org.list
@@ -1,6 +1,3 @@
-##
-### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-###
-
-deb https://db.torproject.org/torproject-admin tpo-all main
-deb https://db.torproject.org/torproject-admin buster main
+# This file is managed by Puppet. DO NOT EDIT.
+# torproject.org
+deb [signed-by=/usr/share/keyrings/torproject-archive-keyring.gpg]
https://db.torproject.org/torproject-admin tpo-all main
diff --git a/apt/sources.list.d/updates.list
b/apt/sources.list.d/updates.list
index 802f6b00..6e93638c 100644
--- a/apt/sources.list.d/updates.list
+++ b/apt/sources.list.d/updates.list
@@ -1,6 +1,3 @@
-##
-### THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-###
-
-deb https://mirror.hetzner.de/debian/packages/ buster-updates
main contrib non-free
-deb https://deb.debian.org/debian/ buster-updates main contrib non-
free
+# This file is managed by Puppet. DO NOT EDIT.
+# updates
+deb https://mirror.hetzner.de/debian/packages/ buster-updates main
contrib non-free
diff --git a/apt/trusted.gpg.d/torproject.org.gpg
b/apt/trusted.gpg.d/torproject.org.gpg
deleted file mode 100644
index e0296a6d..00000000
Binary files a/apt/trusted.gpg.d/torproject.org.gpg and /dev/null differ
}}}
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/33277#comment:3>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
More information about the tor-bugs
mailing list