From 66d8fa2e489a74ae7df8caf8ff6d8e81d10f920b Mon Sep 17 00:00:00 2001 From: Caleb Connolly Date: Sun, 17 Nov 2024 00:40:58 +0100 Subject: [PATCH] systemd/systemd-services: add tailscale service (MR 5806) (MR 5563) Add the service file for tailscale and its default environment file. [ci:skip-build]: already built successfully in CI --- extra-repos/systemd/systemd-services/APKBUILD | 19 +++++++++------ .../systemd-services/etc-default-tailscaled | 8 +++++++ .../system-tailscaled.service | 23 +++++++++++++++++++ 3 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 extra-repos/systemd/systemd-services/etc-default-tailscaled create mode 100644 extra-repos/systemd/systemd-services/system-tailscaled.service diff --git a/extra-repos/systemd/systemd-services/APKBUILD b/extra-repos/systemd/systemd-services/APKBUILD index 0cd66ae6b..b0d8a5f3c 100644 --- a/extra-repos/systemd/systemd-services/APKBUILD +++ b/extra-repos/systemd/systemd-services/APKBUILD @@ -6,7 +6,7 @@ # How to add a new service file (5 steps): pkgname=systemd-services # 1. bump pkgver -pkgver=25 +pkgver=26 pkgrel=0 pkgdesc="Systemd service files" url="https://postmarketos.org" @@ -48,6 +48,7 @@ subpackages=" rtkit-systemd:_service sensorfw-systemd:_service sleep-inhibitor-systemd:_service + tailscale-systemd:_service tqftpserv-systemd:_service udisks2-systemd:_service waydroid-sensors-systemd:_service @@ -102,6 +103,7 @@ _rmtfs_sources="system/rmtfs.service" _rtkit_sources="system/rtkit-daemon.service" _sensorfw_sources="system/sensorfwd.service" _sleep_inhibitor_sources="system/sleep-inhibitor.service" +_tailscale_sources="system/tailscaled.service etc/default/tailscaled" _tqftpserv_sources="system/tqftpserv.service" _udisks2_sources="system/udisks2.service" # From https://github.com/storaged-project/udisks/blob/master/data/udisks2.service.in _waydroid_sources="system/waydroid-container.service" @@ -157,6 +159,7 @@ source="$(flatpath \ $_rtkit_sources \ $_sensorfw_sources \ $_sleep_inhibitor_sources \ + $_tailscale_sources \ $_tqftpserv_sources \ $_udisks2_sources \ $_waydroid_sensors_sources \ @@ -263,7 +266,9 @@ b009a1494f84705dcbea664823e24fb18f326ca84017d9c470ef55c0225d519993aacacf76b24c89 af0e416f78ab317fe09813de58b446e5178457992ea4a2da2eb128811045201087d847e1b7ac0447a59c20129a736135e5d76b113262aa1f76b994e77b9c6b42 system-iio-sensor-proxy.d-hexagonrpcd.conf d12ebe6e7db2a8e34baab640dd4e2ea9cd01bc19054adf32d55528a6b27f71c2006ac2d65a58c98e21ed598e9cc66bfe79e197d20ed9d13f866a5a6cd3e247d5 system-iio-sensor-proxy.service df3388cb7b9d035e54b34d8f8a6594be89c3015f979fe3bdc199fb7db1ab0bef821d6b306eecdf978eb227454d5e50aab29ac02d9722b1b075ec0ce4705e3518 system-iwd.service +9cf877929b16f3437e65d1a0a2049799cc97cc84a7caab6a581e90139495b4febb5fb4c59ee463110866a0b60c9462d6d0fdb331d92d29b30ce6aeada365ac48 user-plasma-kactivitymanagerd.service b0ecd5d413a2010d3f36285c2d35523119c29007e1e4162e51dfc746cc105f990a82a2a2d6037a8b906628c0a4f606729290525c7a53dbcfbc8147244fa403a7 user-kded.service +acf21c4391ca62775491ba4d3b7c460b4163ef07abb195e152c98299a2d12779f3eb95f8cad0aeb3239f2d0fa8222a2483000c45aa6a47e05269876147d89839 user-plasma-kglobalaccel.service f6fb4c890cbf72e344ca7a22e7f033fb4c32ce9f5edc27c03ccc5c21424d6a0ef871d79e8a89a502a707bdceb3bfbd7a5b3c8e16b1cd30e149bf2fdf8cccea9e system-lxc@.service 873b53592786a978659bda8d32de5ed9a9f163ca298c4f4112f10bf635a8170c4060cc15b57ff72b3afd50075cd1c5dbc10030f00b166e2540397da9e1c5e46b user-mmsd-tng.service 5eab6a59c81232b188df45482e325b2d1cb9e038ca147a1b6983c1c095d8194fba804793c5e291b201a820976c8f506aadd2daf7c52fe573a3af708fc9984641 system-ModemManager.service @@ -272,8 +277,6 @@ fa445c4a53214524baed4e9c52a5463592a074f88a5a286eacb60d0907c0545f725afde23abd68cf c0badea3905c1d53d213fbfe11d25b556a2e484fe77eb50e9f4d42e25b67b56a0804e7d8e1b7731cd280cbb3525b4c60311817609381e2308d9f2dfb7c0d7072 system-sshdgenkeys.service 0bed9a8a719661609ad84d1c6fcdf2fe9213e741682b7ddebad82d9744f137c593788ed522868f10b95b599d81743d07ec3212630a7e99d333261dfa1bf1cc11 system-pd-mapper.service 0025c83b3007d1bcf6de70fd6400f3c845aff575987c87f2228e7ccedc8cf69703cd04abf8b51805f31722bb4b8eea9b4fd9afdfe7fdfe1d4c6c4664273de77c system-phosh.service -9cf877929b16f3437e65d1a0a2049799cc97cc84a7caab6a581e90139495b4febb5fb4c59ee463110866a0b60c9462d6d0fdb331d92d29b30ce6aeada365ac48 user-plasma-kactivitymanagerd.service -acf21c4391ca62775491ba4d3b7c460b4163ef07abb195e152c98299a2d12779f3eb95f8cad0aeb3239f2d0fa8222a2483000c45aa6a47e05269876147d89839 user-plasma-kglobalaccel.service e12d8e98e28a795f879aebcceb32a991ee4abcb3bc5ec458aa5378bb52ff86cf39be04bc4a196925f532d623304b3005f561fa5e55d1c87944d718058ec4c0e6 system-plasma-mobile.service 4c4c3f1e5e829ff67dd35df59120ab59730ff1f1ca0aab93f16d670132979a99099fad59e6c736908cc19df9172c9bdfe476ec721a1cc28de8c2210da46ce1f1 system-q6voiced.service 621189aa251655796795f4fa0cd79360bb67573e7327e545064eaadafc83cc7b382a405d6ba80662e0a4ece3876e4270e3563d859a6ba63b5e3854b39c35873e system-qbootctl.service @@ -281,18 +284,20 @@ e12d8e98e28a795f879aebcceb32a991ee4abcb3bc5ec458aa5378bb52ff86cf39be04bc4a196925 1a0958e4fe232967946e9f2b17a13434b137236ba5d18442175d648b084d82df3a9fc5723c1621be899ee290b99777ac3c0ee6ad733e72d8e70f63b37ad00036 system-rtkit-daemon.service d5bf5f01c0feafab4edfc39b75eded608dc3efcd3b918739e3ed2ab11340c9cc9b6fb97c0706ddd3d49b726c5f62e8cdb0048aefafd916f3ad9defc6ff9783bc system-sensorfwd.service be9df5e3fd9c88ec1a8db4aa2d9e8075d74ee3d2670aa3cfc611df3cff4d4041ac888a0338c9d5f134bbc69aa32eb52ac40eb3e0981813afa18389cba14d3818 system-sleep-inhibitor.service +41547eb369937348378e898e0dda7151552056107f4daab5a8a137a1b846560afa923cd345037b4f96bc9cdf2a7f66211a346b77229cc07ce2d0b634ff40dfe7 system-tailscaled.service +324935213f1600e345acdfa70eae29181e9ee02e3aca6a03776ea4856137f72b5791e23aea46210cc756065cadd88fd1b8eb4b26a608fec94f662d683fcb9320 etc-default-tailscaled c569b27925297672c479e12a6425abdf5791886fff77c2c2b67b7aa9277eb0a22e7b95b52dbc225870c97460d0988a4dae18ed864e19096c704c0895de55b699 system-tqftpserv.service c7ea2b18c9d8f82306fbaca6d07b7019de3819d7898c3f50c3d0aceef4da4d311ed3bf31385e2f8998b8e3e326b1eb13309ffd44cf1b2d9db9b40bca00222c16 system-udisks2.service -023fc89481f9079ac2d2d6b8a9ab212cb13a6b309caaa92b336df4c6ee9cff05538f035f8411fd8f6b87ca73b400172f56022edbf02d3776ab6f2aa7af2eebef system-waydroid-container.service 841caa793d256cacea7eb651f3d77039b1c0ddb22727100d6cca74230e528aee09e945e1fdf20eaf40abbe3eaec9210eb7fa27144dc906cab65f8078b36921f9 system-waydroid-sensors.service +023fc89481f9079ac2d2d6b8a9ab212cb13a6b309caaa92b336df4c6ee9cff05538f035f8411fd8f6b87ca73b400172f56022edbf02d3776ab6f2aa7af2eebef system-waydroid-container.service 210a7610acfcaee642ac34abe80e77f492e7e2411a9226d26578675893a125b8333a26c2756cf4376745e32fb99a2b7851d737e4df3b2c7d923f730d8ae33e9d user-wireplumber.service d55edea6983ad73b1817dfac3e6d418113c8e0fbd6cb2835dedcad2e5c76c8889c09348a184ed4ab38397d7d539831ef6a7ce08037e12c7ab6dc274519dc5812 system-wpa_supplicant.service +0ee2f844819c5f954d269d3703c17b5e51888bb89bd4376d3960f97735b1ba9769c932817270fdb75b8ddf291c21ab6eb78d1a8bde14aac83564881b36914066 user-xdg-desktop-portal-gnome.service +eb01dd32fc598e49cbae31847aee4c3e28ee5014df052d65ad02c9a943a9e3399a4a119aa136630efef1157e31f6adc2d8420f8e72dc9da4c0b72645e4c84faa user-xdg-desktop-portal-gtk.service +7d45e305a54417a0afdcc7553dec2d43930b07c12fdbce240bd7d5b89a7653b16baabdf2d7c6dd38649925224f0d73cccf2b8024657b62d47b75c6d9ce46ac20 user-xdg-desktop-portal-phosh.service 9a3620d3df53540a91efa48df322288d96ec887415f538877a979be40eb5239b95917b9ac57fda2c699fe3f1c6500f7de09a4ce6625b0818f5786e125713552f user-xdg-desktop-portal.service e09a3c76f3be961dce9f564bb654ea84d1d7fb59907a2168c0569bf6c17a5ebe9fbe4d1f94f1d014433757bb721bc443d5962deb540cacbd5547b1dd47717f92 user-xdg-desktop-portal-rewrite-launchers.service 9dd95f10dcdb6234697b012c6f428cfca0cfbde24a8951e96cb4c463f55a22d40096a94ca0018f9dbe4ebb2c80eb39faeaa9222f6fb419831520a138f88f0321 user-xdg-document-portal.service 1262f10b97989be726432700a923d7717570feb7b0d78c3c573e21ee6be320f5a618d0d21c1eb351702397caa95b476b8854bf83545993fb464b4a7a80067800 user-xdg-permission-store.service -eb01dd32fc598e49cbae31847aee4c3e28ee5014df052d65ad02c9a943a9e3399a4a119aa136630efef1157e31f6adc2d8420f8e72dc9da4c0b72645e4c84faa user-xdg-desktop-portal-gtk.service -0ee2f844819c5f954d269d3703c17b5e51888bb89bd4376d3960f97735b1ba9769c932817270fdb75b8ddf291c21ab6eb78d1a8bde14aac83564881b36914066 user-xdg-desktop-portal-gnome.service -7d45e305a54417a0afdcc7553dec2d43930b07c12fdbce240bd7d5b89a7653b16baabdf2d7c6dd38649925224f0d73cccf2b8024657b62d47b75c6d9ce46ac20 user-xdg-desktop-portal-phosh.service 744c60fdc6e53ba2c9f370ce8462e1a420cfea973edff49d0caf7a3e65f0f35257d61b5ae3ace3e9d9d48e382cb54d9f2ff96ad02d5e16758a49ba2e07963e5a user-xdg-desktop-portal-wlr.service " diff --git a/extra-repos/systemd/systemd-services/etc-default-tailscaled b/extra-repos/systemd/systemd-services/etc-default-tailscaled new file mode 100644 index 000000000..e8384a4f8 --- /dev/null +++ b/extra-repos/systemd/systemd-services/etc-default-tailscaled @@ -0,0 +1,8 @@ +# Set the port to listen on for incoming VPN packets. +# Remote nodes will automatically be informed about the new port number, +# but you might want to configure this in order to set external firewall +# settings. +PORT="41641" + +# Extra flags you might want to pass to tailscaled. +FLAGS="" diff --git a/extra-repos/systemd/systemd-services/system-tailscaled.service b/extra-repos/systemd/systemd-services/system-tailscaled.service new file mode 100644 index 000000000..719a3c0c9 --- /dev/null +++ b/extra-repos/systemd/systemd-services/system-tailscaled.service @@ -0,0 +1,23 @@ +[Unit] +Description=Tailscale node agent +Documentation=https://tailscale.com/kb/ +Wants=network-pre.target +After=network-pre.target NetworkManager.service systemd-resolved.service + +[Service] +EnvironmentFile=/etc/default/tailscaled +ExecStart=/usr/sbin/tailscaled --state=/var/lib/tailscale/tailscaled.state --socket=/run/tailscale/tailscaled.sock --port=${PORT} $FLAGS +ExecStopPost=/usr/sbin/tailscaled --cleanup + +Restart=on-failure + +RuntimeDirectory=tailscale +RuntimeDirectoryMode=0755 +StateDirectory=tailscale +StateDirectoryMode=0700 +CacheDirectory=tailscale +CacheDirectoryMode=0750 +Type=notify + +[Install] +WantedBy=multi-user.target