From ad4cdcd9bfccf89066163fe2e4d4076857921537 Mon Sep 17 00:00:00 2001
From: Dennis Eriksen <d@ennis.no>
Date: Tue, 12 Nov 2019 08:27:23 +0100
Subject: moving from skeleton to extra

---
 mkosi.extra/etc/apt/apt.conf.d/20auto-upgrades     |  9 ++++++
 .../etc/apt/apt.conf.d/50unattended-upgrades       | 34 ++++++++++++++++++++++
 mkosi.extra/etc/systemd/system/filebin.service     | 33 +++++++++++++++++++++
 mkosi.skeleton/etc/apt/apt.conf.d/20auto-upgrades  |  9 ------
 .../etc/apt/apt.conf.d/50unattended-upgrades       | 34 ----------------------
 mkosi.skeleton/etc/systemd/system/filebin.service  | 33 ---------------------
 6 files changed, 76 insertions(+), 76 deletions(-)
 create mode 100644 mkosi.extra/etc/apt/apt.conf.d/20auto-upgrades
 create mode 100644 mkosi.extra/etc/apt/apt.conf.d/50unattended-upgrades
 create mode 100644 mkosi.extra/etc/systemd/system/filebin.service
 delete mode 100644 mkosi.skeleton/etc/apt/apt.conf.d/20auto-upgrades
 delete mode 100644 mkosi.skeleton/etc/apt/apt.conf.d/50unattended-upgrades
 delete mode 100644 mkosi.skeleton/etc/systemd/system/filebin.service

diff --git a/mkosi.extra/etc/apt/apt.conf.d/20auto-upgrades b/mkosi.extra/etc/apt/apt.conf.d/20auto-upgrades
new file mode 100644
index 0000000..4c725ab
--- /dev/null
+++ b/mkosi.extra/etc/apt/apt.conf.d/20auto-upgrades
@@ -0,0 +1,9 @@
+APT::Periodic::Unattended-Upgrade "1";
+
+APT::Periodic::Update-Package-Lists "1";
+
+
+APT::Periodic::AutocleanInterval "7";
+
+
+
diff --git a/mkosi.extra/etc/apt/apt.conf.d/50unattended-upgrades b/mkosi.extra/etc/apt/apt.conf.d/50unattended-upgrades
new file mode 100644
index 0000000..768347b
--- /dev/null
+++ b/mkosi.extra/etc/apt/apt.conf.d/50unattended-upgrades
@@ -0,0 +1,34 @@
+// Unattended-Upgrade::Origins-Pattern controls which packages are
+// upgraded.
+Unattended-Upgrade::Origins-Pattern {
+      "origin=Ubuntu,archive=${distro_codename}-security";
+      "o=Ubuntu,a=${distro_codename}";
+      "o=Ubuntu,a=${distro_codename}-updates";
+      "o=Ubuntu,a=${distro_codename}-proposed-updates";
+      "o=Ubuntu,n=${distro_codename}-backports";
+  };
+
+// List of packages to not update (regexp are supported)
+Unattended-Upgrade::Package-Blacklist {
+};
+
+
+// Split the upgrade into the smallest possible chunks so that
+// they can be interrupted with SIGUSR1. This makes the upgrade
+// a bit slower but it has the benefit that shutdown while a upgrade
+// is running is possible (with a small delay)
+Unattended-Upgrade::MinimalSteps "true";
+
+
+// Do automatic removal of new unused dependencies after the upgrade
+// (equivalent to apt-get autoremove)
+Unattended-Upgrade::Remove-Unused-Dependencies "true";
+
+
+// Do upgrade application even if it requires restart after upgrade
+// I.e. "XB-Upgrade-Requires: app-restart" is set in the debian/control file
+Unattended-Upgrade::IgnoreAppsRequireRestart "true";
+
+// Automatically run "dpkg --force-confold --configure -a".
+Unattended-Upgrade::AutoFixInterruptedDpkg "true";
+ 
diff --git a/mkosi.extra/etc/systemd/system/filebin.service b/mkosi.extra/etc/systemd/system/filebin.service
new file mode 100644
index 0000000..b7c557f
--- /dev/null
+++ b/mkosi.extra/etc/systemd/system/filebin.service
@@ -0,0 +1,33 @@
+# From https://github.com/espebra/filebin/blob/master/etc/systemd/filebin.service.example
+
+[Unit]
+Description=Filebin
+Requires=network.target
+After=network.target
+
+[Service]
+ExecStart=/go/filebin \
+            --filedir /var/lib/filebin/files \
+            --tempdir /tmp \
+            --baseurl https://f.dnns.no \
+            --port 8304 \
+            --access-log /var/log/filebin/access.log \
+            --expiration 604800
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=filebin
+PrivateTmp=true
+ProtectSystem=strict
+ProtectHome=true
+ProtectKernelTunables=true
+ProtectControlGroups=true
+ProtectKernelModules=true
+InaccessiblePaths=/etc /home /opt /srv /var/local /var/mail
+BindPaths=/var/log/filebin /var/lib/filebin
+RemoveIPC=true
+User=filebin
+Group=filebin
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/mkosi.skeleton/etc/apt/apt.conf.d/20auto-upgrades b/mkosi.skeleton/etc/apt/apt.conf.d/20auto-upgrades
deleted file mode 100644
index 4c725ab..0000000
--- a/mkosi.skeleton/etc/apt/apt.conf.d/20auto-upgrades
+++ /dev/null
@@ -1,9 +0,0 @@
-APT::Periodic::Unattended-Upgrade "1";
-
-APT::Periodic::Update-Package-Lists "1";
-
-
-APT::Periodic::AutocleanInterval "7";
-
-
-
diff --git a/mkosi.skeleton/etc/apt/apt.conf.d/50unattended-upgrades b/mkosi.skeleton/etc/apt/apt.conf.d/50unattended-upgrades
deleted file mode 100644
index 768347b..0000000
--- a/mkosi.skeleton/etc/apt/apt.conf.d/50unattended-upgrades
+++ /dev/null
@@ -1,34 +0,0 @@
-// Unattended-Upgrade::Origins-Pattern controls which packages are
-// upgraded.
-Unattended-Upgrade::Origins-Pattern {
-      "origin=Ubuntu,archive=${distro_codename}-security";
-      "o=Ubuntu,a=${distro_codename}";
-      "o=Ubuntu,a=${distro_codename}-updates";
-      "o=Ubuntu,a=${distro_codename}-proposed-updates";
-      "o=Ubuntu,n=${distro_codename}-backports";
-  };
-
-// List of packages to not update (regexp are supported)
-Unattended-Upgrade::Package-Blacklist {
-};
-
-
-// Split the upgrade into the smallest possible chunks so that
-// they can be interrupted with SIGUSR1. This makes the upgrade
-// a bit slower but it has the benefit that shutdown while a upgrade
-// is running is possible (with a small delay)
-Unattended-Upgrade::MinimalSteps "true";
-
-
-// Do automatic removal of new unused dependencies after the upgrade
-// (equivalent to apt-get autoremove)
-Unattended-Upgrade::Remove-Unused-Dependencies "true";
-
-
-// Do upgrade application even if it requires restart after upgrade
-// I.e. "XB-Upgrade-Requires: app-restart" is set in the debian/control file
-Unattended-Upgrade::IgnoreAppsRequireRestart "true";
-
-// Automatically run "dpkg --force-confold --configure -a".
-Unattended-Upgrade::AutoFixInterruptedDpkg "true";
- 
diff --git a/mkosi.skeleton/etc/systemd/system/filebin.service b/mkosi.skeleton/etc/systemd/system/filebin.service
deleted file mode 100644
index b7c557f..0000000
--- a/mkosi.skeleton/etc/systemd/system/filebin.service
+++ /dev/null
@@ -1,33 +0,0 @@
-# From https://github.com/espebra/filebin/blob/master/etc/systemd/filebin.service.example
-
-[Unit]
-Description=Filebin
-Requires=network.target
-After=network.target
-
-[Service]
-ExecStart=/go/filebin \
-            --filedir /var/lib/filebin/files \
-            --tempdir /tmp \
-            --baseurl https://f.dnns.no \
-            --port 8304 \
-            --access-log /var/log/filebin/access.log \
-            --expiration 604800
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=filebin
-PrivateTmp=true
-ProtectSystem=strict
-ProtectHome=true
-ProtectKernelTunables=true
-ProtectControlGroups=true
-ProtectKernelModules=true
-InaccessiblePaths=/etc /home /opt /srv /var/local /var/mail
-BindPaths=/var/log/filebin /var/lib/filebin
-RemoveIPC=true
-User=filebin
-Group=filebin
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-- 
cgit v1.2.3