aboutsummaryrefslogtreecommitdiff
path: root/files/etc
diff options
context:
space:
mode:
Diffstat (limited to 'files/etc')
-rw-r--r--files/etc/apt/keyrings/signal.org.gpg (renamed from files/etc/apt/trusted.gpg.d/signal.org.gpg)bin2223 -> 2223 bytes
-rw-r--r--files/etc/apt/trusted.gpg.d/torproject.org.gpgbin37730 -> 0 bytes
-rw-r--r--files/etc/rc.local5
3 files changed, 5 insertions, 0 deletions
diff --git a/files/etc/apt/trusted.gpg.d/signal.org.gpg b/files/etc/apt/keyrings/signal.org.gpg
index b5e68a0..b5e68a0 100644
--- a/files/etc/apt/trusted.gpg.d/signal.org.gpg
+++ b/files/etc/apt/keyrings/signal.org.gpg
Binary files differ
diff --git a/files/etc/apt/trusted.gpg.d/torproject.org.gpg b/files/etc/apt/trusted.gpg.d/torproject.org.gpg
deleted file mode 100644
index 7614b20..0000000
--- a/files/etc/apt/trusted.gpg.d/torproject.org.gpg
+++ /dev/null
Binary files differ
diff --git a/files/etc/rc.local b/files/etc/rc.local
index 8d93e07..fd951eb 100644
--- a/files/etc/rc.local
+++ b/files/etc/rc.local
@@ -19,6 +19,11 @@ fi
# Force the hostname
/bin/hostname `cat /etc/hostname`
+# Remove puppetd lock, then restart puppet with the right hostname
+# Not using this anymore since we moved to a masterless setup.
+#rm -f /var/lib/puppet/state/puppetdlock
+#/etc/init.d/puppet restart
+
# Keep this mountpoint while ekeyd fact needs it
if [ -d "/proc/bus/usb" ]; then
/bin/mount -t usbfs usbfs /proc/bus/usb -onodev,noexec,nosuid