From patchwork Wed Dec 27 15:20:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 1880539 X-Patchwork-Delegate: zajec5@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=L24N6TzD; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=ddriZojD; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4T0b6B3ylKz23dG for ; Thu, 28 Dec 2023 02:24:33 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=at0aR+mPcpZDWYOzr5yMG+PfXg5XxXMV8BlEAGkhtLw=; b=L24N6TzDKBd0eU K0Hy+XY9eyZHRfdl/PE90xklqq8A1Y/tQ3xDg6kp3Gy/y4zaC7nwVkni7Pr2rVKGIgLvYVrEuzMoj AsYGg/geMZe/7R/pH6uROsXCN46D+7GzUb/fnTnvdcqi4/KkU5+t77TMMyZ9IYtR4c992ZErmqbMw B1+GlYgncbvUIdVawvnN8EnIuv9NGLSe7q2cef9ClehWYBP750qysp3faY3CrTDS0G36zPh+aGuYX auCVf81aBpde5sLLn2qcLwEWnsKx5wgceVrCMwZYLfXeUarUf1SgkVi60Ju3J2FcDKiQCIvEAtt3F F+n92dtlmffypnfvpQ9g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rIViW-00Evqb-2u; Wed, 27 Dec 2023 15:21:08 +0000 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rIViQ-00Evq1-0r for openwrt-devel@lists.openwrt.org; Wed, 27 Dec 2023 15:21:04 +0000 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a235eb41251so597034966b.3 for ; Wed, 27 Dec 2023 07:21:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703690459; x=1704295259; darn=lists.openwrt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=1fYz1CIlxqC9v3VLtfWVeKBQHpHtS81qxRcnnB2dnXs=; b=ddriZojD8KbJUi4EoovL65+WJylU5xEphu0RVP7bsPkY+EK3NglCP5W6I8vybGwv2N 6XroOsf1vleAg5TsFENoia+Le5raobIkfxkbMlWmZd0+E9h0WmO31IOw2AaZET7jVOqP p8UUe6tbQ8nvgX9pc/DKs/BpoL3CLV0C4bONQ/1HCU6trwVfdCHlrreUeK2cRIFBjuFh SEGgZ79ECFcP3a4RLOXfVVGqooHA9iAuidj5dRHoqE++bOsjubXpwg+GOUvX3MWsljnx i0kadwkmGmE9epzQtyUG6GjK1WjmzVfxTVIL8eJOqFeWd/sHxUtjAi16/bYRT0prlerg OI5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703690459; x=1704295259; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=1fYz1CIlxqC9v3VLtfWVeKBQHpHtS81qxRcnnB2dnXs=; b=jXSMuOvlSq2jrk7wU5z+snpy9IzafPpwcP9EsBbbp0P9gDspToQIQwvWsCbMYwzrCC CyNGzX6GhhwnAOlGbx77k7m9ZWaUxYG7c+k6i+kDsml67WclC6JZgdP1V1cN89VsuVMR Kgc4apWvyFdKyhyTFeZFVnn9V4kWm2xYKYkebSFXD1+QVLaX7k/c28TxMB2T+7kSMnMu +IvbBWBSbI5mauZRcx+c9wxnX+v8oZnsTJmhddkHFC9ooIzTryuQ7mQlx1oDiwavpgQ8 3jzvGM1gBAnNV93Or2Y68d3E96QvUIajnuAQHlTQoCWLNyocWtg7pnSN7XW1SCvkBp2+ FlOA== X-Gm-Message-State: AOJu0Yy7e4sd0TCCEM7UOvYq3s6rAVymh05l+faEIztjX6HCfaDlvYUF Ed0ULtu0EXHV4kwMmtLoHNAG9xknwho= X-Google-Smtp-Source: AGHT+IEk1t6gvbBgqJjn6tfAybClfvNJ4N62W38TdOmhgV9NfjAmwQR1N63Xj0WlWwlIERmCgrnnAQ== X-Received: by 2002:a17:906:20d3:b0:a23:510c:c9c1 with SMTP id c19-20020a17090620d300b00a23510cc9c1mr2279621ejc.218.1703690458428; Wed, 27 Dec 2023 07:20:58 -0800 (PST) Received: from localhost.lan (031011218106.poznan.vectranet.pl. [31.11.218.106]) by smtp.gmail.com with ESMTPSA id bz8-20020a1709070aa800b00a234b686f93sm6655062ejc.187.2023.12.27.07.20.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Dec 2023 07:20:57 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Hauke Mehrtens Subject: [PATCH] uhttpd: handle reload after uhttpd-mod-ubus installation using postinst Date: Wed, 27 Dec 2023 16:20:45 +0100 Message-Id: <20231227152045.18336-1-zajec5@gmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231227_072102_305464_979D582D X-CRM114-Status: GOOD ( 10.27 ) X-Spam-Score: 0.1 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Rafa=C5=82_Mi=C5=82ecki_Use_po?= =?unknown-8bit?q?stinst_script_to_reload_service?= =?unknown-8bit?q?_instead_of_uci-defaults_hack=2E_It=27s_possible_thanks_to_?= =?unknown-8bit?q?recent_base-files_change?= =?unknown-8bit?q?_that_executes_postinst_after_uci-defaults=2E_This_fixes_su?= =?unknown-8bit?q?pport_for_uhttpd?= =?unknown-8bit?q?_customizations=2E_It=27s_possible_=28again=29_to_adjust_uh?= =?unknown-8bit?q?ttpd_config_with_custom?= =?unknown-8bit?q?_uci-defaults_before_it_gets_started=2E_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=280=2E1_points=2C_5=2E0_req?= =?unknown-8bit?q?uired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_0=2E0_FREEMAIL=5FFROM__________Sender_email_is_commonly_ab?= =?unknown-8bit?q?used_enduser_mail?= =?unknown-8bit?q?_provider?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_0=2E2_FREEMAIL=5FENVFROM=5FEND=5FDIGIT_Envelope-from_freem?= =?unknown-8bit?q?ail_username_ends?= =?unknown-8bit?q?_in_digit?= =?unknown-8bit?q?_=5Bzajec5=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?= =?unknown-8bit?q?_no_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDo2MzMgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_author=27s_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily?= =?unknown-8bit?q?_valid?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Rafał Miłecki Use postinst script to reload service instead of uci-defaults hack. It's possible thanks to recent base-files change that executes postinst after uci-defaults. This fixes support for uhttpd customizations. It's possible (again) to adjust uhttpd config with custom uci-defaults before it gets started. Cc: Hauke Mehrtens Fixes: d25d281fd668 ("uhttpd: Reload config after uhttpd-mod-ubus was added") Ref: b799dd3c705d ("base-files: execute package's "postinst" after executing uci-defaults") Signed-off-by: Rafał Miłecki --- This is a clean fix compared to my proposed hack: [PATCH] uhttpd: uhttpd-mod-ubus: reload uhttpd only if it's runtime install https://patchwork.ozlabs.org/project/openwrt/patch/20231126204739.14315-1-zajec5@gmail.com/ I'm planning to push it in few days unless base-files change blows up some existing packages. package/network/services/uhttpd/Makefile | 9 ++++++++- package/network/services/uhttpd/files/ubus.default | 6 ------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index 02a02405fd..37117bf911 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git @@ -107,6 +107,13 @@ define Package/uhttpd-mod-ubus/install $(INSTALL_DATA) ./files/ubus.default $(1)/etc/uci-defaults/00_uhttpd_ubus endef +define Package/uhttpd-mod-ubus/postinst +#!/bin/sh +if [ -z "$${IPKG_INSTROOT}" ]; then + /etc/init.d/uhttpd reload +fi +endef + define Package/uhttpd-mod-ucode/install $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_BIN) $(PKG_BUILD_DIR)/uhttpd_ucode.so $(1)/usr/lib/ diff --git a/package/network/services/uhttpd/files/ubus.default b/package/network/services/uhttpd/files/ubus.default index 474016c1c5..d0a218a0ad 100644 --- a/package/network/services/uhttpd/files/ubus.default +++ b/package/network/services/uhttpd/files/ubus.default @@ -1,17 +1,11 @@ #!/bin/sh -commit=0 - if [ -z "$(uci -q get uhttpd.main.ubus_prefix)" ]; then uci set uhttpd.main.ubus_prefix=/ubus - commit=1 fi [ "$(uci -q get uhttpd.main.ubus_socket)" = "/var/run/ubus.sock" ] && { uci set uhttpd.main.ubus_socket='/var/run/ubus/ubus.sock' - commit=1 } -[ "$commit" = 1 ] && uci commit uhttpd && /etc/init.d/uhttpd reload - exit 0