From 5a6271f63fbb5d1d269c7ba62a55289ac9b5ef11 Mon Sep 17 00:00:00 2001 From: dennis Date: Tue, 12 Nov 2019 11:13:17 +0100 Subject: moving from skeleton to extra, and disabling dhcp --- mkosi.extra/etc/apt/apt.conf.d/20auto-upgrades | 6 ++++ .../etc/apt/apt.conf.d/50unattended-upgrades | 33 ++++++++++++++++++++++ mkosi.extra/etc/docker-pi-hole-version | 1 + .../etc/systemd/network/80-container-host0.network | 1 + mkosi.extra/etc/systemd/network/wired.network | 15 ++++++++++ mkosi.skeleton/etc/apt/apt.conf.d/20auto-upgrades | 6 ---- .../etc/apt/apt.conf.d/50unattended-upgrades | 33 ---------------------- mkosi.skeleton/etc/docker-pi-hole-version | 1 - .../etc/systemd/network/80-container-host0.network | 1 - mkosi.skeleton/etc/systemd/network/wired.network | 14 --------- 10 files changed, 56 insertions(+), 55 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/docker-pi-hole-version create mode 120000 mkosi.extra/etc/systemd/network/80-container-host0.network create mode 100644 mkosi.extra/etc/systemd/network/wired.network 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/docker-pi-hole-version delete mode 120000 mkosi.skeleton/etc/systemd/network/80-container-host0.network delete mode 100644 mkosi.skeleton/etc/systemd/network/wired.network 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..8504436 --- /dev/null +++ b/mkosi.extra/etc/apt/apt.conf.d/20auto-upgrades @@ -0,0 +1,6 @@ +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..f996348 --- /dev/null +++ b/mkosi.extra/etc/apt/apt.conf.d/50unattended-upgrades @@ -0,0 +1,33 @@ +// 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/docker-pi-hole-version b/mkosi.extra/etc/docker-pi-hole-version new file mode 100644 index 0000000..db6ecdd --- /dev/null +++ b/mkosi.extra/etc/docker-pi-hole-version @@ -0,0 +1 @@ +v4.3.2 diff --git a/mkosi.extra/etc/systemd/network/80-container-host0.network b/mkosi.extra/etc/systemd/network/80-container-host0.network new file mode 120000 index 0000000..dc1dc0c --- /dev/null +++ b/mkosi.extra/etc/systemd/network/80-container-host0.network @@ -0,0 +1 @@ +/dev/null \ No newline at end of file diff --git a/mkosi.extra/etc/systemd/network/wired.network b/mkosi.extra/etc/systemd/network/wired.network new file mode 100644 index 0000000..126654d --- /dev/null +++ b/mkosi.extra/etc/systemd/network/wired.network @@ -0,0 +1,15 @@ +[Match] +Name=host0 + +[Network] +DHCP=false +DNS=127.0.0.1 +Domains=dnns.no +Address=192.168.1.250 +Gateway=192.168.1.1 +Address=10.71.2.2/24 + +[Route] +Gateway=10.71.2.1 +Destination=10.71.2.0/24 +GatewayOnlink=true 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 8504436..0000000 --- a/mkosi.skeleton/etc/apt/apt.conf.d/20auto-upgrades +++ /dev/null @@ -1,6 +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 f996348..0000000 --- a/mkosi.skeleton/etc/apt/apt.conf.d/50unattended-upgrades +++ /dev/null @@ -1,33 +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/docker-pi-hole-version b/mkosi.skeleton/etc/docker-pi-hole-version deleted file mode 100644 index db6ecdd..0000000 --- a/mkosi.skeleton/etc/docker-pi-hole-version +++ /dev/null @@ -1 +0,0 @@ -v4.3.2 diff --git a/mkosi.skeleton/etc/systemd/network/80-container-host0.network b/mkosi.skeleton/etc/systemd/network/80-container-host0.network deleted file mode 120000 index dc1dc0c..0000000 --- a/mkosi.skeleton/etc/systemd/network/80-container-host0.network +++ /dev/null @@ -1 +0,0 @@ -/dev/null \ No newline at end of file diff --git a/mkosi.skeleton/etc/systemd/network/wired.network b/mkosi.skeleton/etc/systemd/network/wired.network deleted file mode 100644 index 7e97f43..0000000 --- a/mkosi.skeleton/etc/systemd/network/wired.network +++ /dev/null @@ -1,14 +0,0 @@ -[Match] -Name=host0 - -[Network] -DNS=127.0.0.1 -Domains=dnns.no -Address=192.168.1.250 -Gateway=192.168.1.1 -Address=10.71.2.2/24 - -[Route] -Gateway=10.71.2.1 -Destination=10.71.2.0/24 -GatewayOnlink=true -- cgit v1.2.3