From 83e44519614ad5db7b88a6c66acbc0127298ae22 Mon Sep 17 00:00:00 2001 From: dennis Date: Tue, 12 Nov 2019 11:10:57 +0100 Subject: moving from skeleton to extra --- mkosi.extra/etc/apt/apt.conf.d/20auto-upgrades | 6 ++++ .../etc/apt/apt.conf.d/50unattended-upgrades | 33 ++++++++++++++++++++++ .../system/multi-user.target.wants/sonarr.service | 1 + mkosi.extra/etc/systemd/system/sonarr.service | 17 +++++++++++ mkosi.skeleton/etc/apt/apt.conf.d/20auto-upgrades | 6 ---- .../etc/apt/apt.conf.d/50unattended-upgrades | 33 ---------------------- .../system/multi-user.target.wants/sonarr.service | 1 - mkosi.skeleton/etc/systemd/system/sonarr.service | 17 ----------- 8 files changed, 57 insertions(+), 57 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 120000 mkosi.extra/etc/systemd/system/multi-user.target.wants/sonarr.service create mode 100644 mkosi.extra/etc/systemd/system/sonarr.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 120000 mkosi.skeleton/etc/systemd/system/multi-user.target.wants/sonarr.service delete mode 100644 mkosi.skeleton/etc/systemd/system/sonarr.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..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/systemd/system/multi-user.target.wants/sonarr.service b/mkosi.extra/etc/systemd/system/multi-user.target.wants/sonarr.service new file mode 120000 index 0000000..c518c7e --- /dev/null +++ b/mkosi.extra/etc/systemd/system/multi-user.target.wants/sonarr.service @@ -0,0 +1 @@ +../sonarr.service \ No newline at end of file diff --git a/mkosi.extra/etc/systemd/system/sonarr.service b/mkosi.extra/etc/systemd/system/sonarr.service new file mode 100644 index 0000000..86b461b --- /dev/null +++ b/mkosi.extra/etc/systemd/system/sonarr.service @@ -0,0 +1,17 @@ +[Unit] +Description=Sonarr Daemon +After=network.target + +[Service] +User=warez +Group=warez +Umask=022 + +Type=simple +ExecStart=/usr/bin/mono /opt/NzbDrone/NzbDrone.exe -nobrowser -data=/config +TimeoutStopSec=20 +KillMode=process +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 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/systemd/system/multi-user.target.wants/sonarr.service b/mkosi.skeleton/etc/systemd/system/multi-user.target.wants/sonarr.service deleted file mode 120000 index c518c7e..0000000 --- a/mkosi.skeleton/etc/systemd/system/multi-user.target.wants/sonarr.service +++ /dev/null @@ -1 +0,0 @@ -../sonarr.service \ No newline at end of file diff --git a/mkosi.skeleton/etc/systemd/system/sonarr.service b/mkosi.skeleton/etc/systemd/system/sonarr.service deleted file mode 100644 index 86b461b..0000000 --- a/mkosi.skeleton/etc/systemd/system/sonarr.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Sonarr Daemon -After=network.target - -[Service] -User=warez -Group=warez -Umask=022 - -Type=simple -ExecStart=/usr/bin/mono /opt/NzbDrone/NzbDrone.exe -nobrowser -data=/config -TimeoutStopSec=20 -KillMode=process -Restart=on-failure - -[Install] -WantedBy=multi-user.target -- cgit v1.2.3