From f689c380255955e3eb6b762b499faa0a571bc704 Mon Sep 17 00:00:00 2001 From: Martin Habovstiak Date: Mon, 18 Dec 2023 10:42:57 +0100 Subject: [PATCH] Specification cleanups The previous version of Debcrafter didn't catch these mistakes. Now they were discovered and fixed. --- pkg_specs/btc-transmuter-system-@variant.sps | 1 - pkg_specs/btc-transmuter.sps | 1 - pkg_specs/publish-bitcoin-whitepaper.sps | 1 - pkg_specs/ridetheln-lnd-system-@variant.sps | 3 ++- pkg_specs/selfhost-clearnet-certbot.sps | 1 - pkg_specs/selfhost-clearnet.sps | 1 - pkg_specs/selfhost-onion.sps | 1 - 7 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkg_specs/btc-transmuter-system-@variant.sps b/pkg_specs/btc-transmuter-system-@variant.sps index 5328168..737b018 100644 --- a/pkg_specs/btc-transmuter-system-@variant.sps +++ b/pkg_specs/btc-transmuter-system-@variant.sps @@ -1,5 +1,4 @@ name = "btc-transmuter-system-@variant" -pkg_type = "service" bin_package = "btc-transmuter" binary = "/usr/bin/btc-transmuter" conf_param = "--conf=" diff --git a/pkg_specs/btc-transmuter.sps b/pkg_specs/btc-transmuter.sps index 744a3a8..11acd87 100644 --- a/pkg_specs/btc-transmuter.sps +++ b/pkg_specs/btc-transmuter.sps @@ -1,5 +1,4 @@ name = "btc-transmuter" -pkg_type = "basic" architecture = "any" summary = "A self-hosted ,modular IFTTT-inspired system for bitcoin services written in C# " depends = ["dotnet-runtime-3.1", "aspnetcore-runtime-3.1"] diff --git a/pkg_specs/publish-bitcoin-whitepaper.sps b/pkg_specs/publish-bitcoin-whitepaper.sps index 2449700..2ec9cef 100644 --- a/pkg_specs/publish-bitcoin-whitepaper.sps +++ b/pkg_specs/publish-bitcoin-whitepaper.sps @@ -1,5 +1,4 @@ name = "publish-bitcoin-whitepaper" -architecture = "all" extends = "selfhost" depends_on_extended = true replaces = false diff --git a/pkg_specs/ridetheln-lnd-system-@variant.sps b/pkg_specs/ridetheln-lnd-system-@variant.sps index 356d340..b4b04bc 100644 --- a/pkg_specs/ridetheln-lnd-system-@variant.sps +++ b/pkg_specs/ridetheln-lnd-system-@variant.sps @@ -41,6 +41,7 @@ type = "string" template = "https://127.0.0.1:{lnd-system-@variant/rest_port}" structure = ["Settings", "lnServerUrl"] +[[plug]] run_as_user = "root" -register_cmd = ["bash", "-c", "echo -e '[Unit]\nAfter=lnd-system-{variant}\nRequires=lnd-system-{variant}' > /etc/systemd/system/ridetheln-system.d/bridge-lnd-system-{variant}.conf"] +register_cmd = ["bash", "-c", "mkdir -p /etc/systemd/system/ridetheln-system.d && echo -e '[Unit]\nAfter=lnd-system-{variant}\nRequires=lnd-system-{variant}' > /etc/systemd/system/ridetheln-system.d/bridge-lnd-system-{variant}.conf"] unregister_cmd = ["rm", "-f", "/etc/systemd/system/ridetheln-system.d/bridge-lnd-system-{variant}.conf"] diff --git a/pkg_specs/selfhost-clearnet-certbot.sps b/pkg_specs/selfhost-clearnet-certbot.sps index 0f5c365..2b63dfc 100644 --- a/pkg_specs/selfhost-clearnet-certbot.sps +++ b/pkg_specs/selfhost-clearnet-certbot.sps @@ -1,5 +1,4 @@ name = "selfhost-clearnet-certbot" -architecture = "all" extends = "selfhost" replaces = false depends = ["certbot", "python3-certbot-nginx", "bash"] diff --git a/pkg_specs/selfhost-clearnet.sps b/pkg_specs/selfhost-clearnet.sps index b0f8313..558cb94 100644 --- a/pkg_specs/selfhost-clearnet.sps +++ b/pkg_specs/selfhost-clearnet.sps @@ -1,5 +1,4 @@ name = "selfhost-clearnet" -architecture = "all" summary = "Tooling for hosting web applications over clearnet domain" extends = "selfhost" recommends = ["selfhost", "default-selfhost-tls (>= 1.0) | selfhost-tls (>= 1.0)", "default-selfhost-tls (<< 2.0) | selfhost-tls (<< 2.0)"] diff --git a/pkg_specs/selfhost-onion.sps b/pkg_specs/selfhost-onion.sps index 1e1d577..0f679b1 100644 --- a/pkg_specs/selfhost-onion.sps +++ b/pkg_specs/selfhost-onion.sps @@ -1,5 +1,4 @@ name = "selfhost-onion" -architecture = "all" summary = "Tooling for hosting web applications over onion domain" extends = "selfhost" depends = ["tor-hs-patch-config", "bash"]