From nobody Wed Feb 28 20:47:45 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TlRJ1728Pz5CP2B; Wed, 28 Feb 2024 20:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlRJ15Qy7z4Z2q; Wed, 28 Feb 2024 20:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709153265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xD5ly+YSYQdPCoPT9YWrO0YrNtVDuQWup5hBgPm0N/0=; b=uYixX3SYag+c2zhpMLhV9uFg0r6V5IbEhF+XGDHRgBEKkOPAxQH9NjpMgwaZwzdD/wtrpJ CZF7hJilgVRGHA6qP0TKwos1lwquaevE/wUsEJ0qCjB/XN8DM3RoHyfzRC0umEj8WpaBMf iy/WIZtCCcAwkm1qzoAZpde6v65iDuh2CIvCo9B2ZvqXQqg3oEjI5jZmpOr9mGobTJlZko iCBJxHqOvjELYmpKE2XkDmvYy5I0O7cHUkOX4vuT3+o9afqJy234l/VBcpVydOIU7+iAYK 424DlBF9utdASNGAp/RVQJbNjkTswZfGJ9rtCOxrbxw0po1fwgfmetIZMqkntA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709153265; a=rsa-sha256; cv=none; b=jt4zXJcDhpmczm1VRKqQWAAgp/dKxyCwevj6TmVh2R6rE67Gp9PtJysHDWarmK0skEAJ2v YneKaZAtsIzgFhws3euv4zKGuxINkaMGqN4pS/Uk1IwmAJQFnv8Duk/14GaRjz4QvMk0KG eE3LEK5AVR7isLThyPAZ8iOkMZIUfVY6EzersuuHDxTNJGxW+defuQx9m7HJPuUAqSwjhm GLmvCPEZym3PYoekGB/F/6ev8aS71jSZ276HaK3O0vNBER2MZqBWUa93Jl0Y+LnRrMOeNC T0gaF/FAvlqd0TUczk93kUkxRYBsj/JsHBftm8F5wH6je7lzTrc+tYohKNgDpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709153265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xD5ly+YSYQdPCoPT9YWrO0YrNtVDuQWup5hBgPm0N/0=; b=EY4KNsr4hkrPzOIk5/Fq01kAHDs1+X/c1lpIsaOJBRlfiQ3OB7YqQSUkkmqvdiTZEbYrG5 BwTnxGEZNVSRZMx6MX+kCx3wiofQk4xpr2CJjCWZ88eH5uhzPzB4J0yWCP4q1jd5phlW8D kSBfWh5fyakRa49bxmw90GvrgksMGTDJZi7ZQPmnkBkGA9SFcBO2H0NLsonKdRNx4Wk9oc yOyKEyiE05C7/nmRKIgRQ2kVJSCZZh38TmntbP+zowsMJosubrW9VadpUfQd5nzIxoIYKV LIRnANBPhn10HVv5WDqXSMa131GlvXUpXPVhJAGUWsPmLOOoVmwtiv3fLIsDkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TlRJ14XpRz1BNX; Wed, 28 Feb 2024 20:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41SKljFe024296; Wed, 28 Feb 2024 20:47:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41SKlj8J024293; Wed, 28 Feb 2024 20:47:45 GMT (envelope-from git) Date: Wed, 28 Feb 2024 20:47:45 GMT Message-Id: <202402282047.41SKlj8J024293@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Florian Smeets Subject: git: f50d7d574155 - main - net-mgmt/icingaweb2-module-director: Fix icinga-director daemon List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: flo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f50d7d57415540722c87b8164e5b0b20b0fab1c0 Auto-Submitted: auto-generated The branch main has been updated by flo: URL: https://cgit.FreeBSD.org/ports/commit/?id=f50d7d57415540722c87b8164e5b0b20b0fab1c0 commit f50d7d57415540722c87b8164e5b0b20b0fab1c0 Author: Florian Smeets AuthorDate: 2024-02-28 20:39:34 +0000 Commit: Florian Smeets CommitDate: 2024-02-28 20:46:44 +0000 net-mgmt/icingaweb2-module-director: Fix icinga-director daemon The last update lost important information from the pkg-plist. Restore it to make it possible to start icinga-daemon again. Without this change the daemon could not start because of wrong permissions in /var/run. Starting icinga_director. daemon: ppidfile ``/var/run/icinga-director/icinga_director.pid'': Permission denied /usr/local/etc/rc.d/icinga-director: WARNING: failed to start icinga_director PR: 277212 Approved by: portmgr (blanket, just fix it) Fixes: 02bf6f32a982 --- net-mgmt/icingaweb2-module-director/Makefile | 1 + net-mgmt/icingaweb2-module-director/pkg-plist | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/net-mgmt/icingaweb2-module-director/Makefile b/net-mgmt/icingaweb2-module-director/Makefile index d59ed201e02b..2da66542f9b9 100644 --- a/net-mgmt/icingaweb2-module-director/Makefile +++ b/net-mgmt/icingaweb2-module-director/Makefile @@ -1,6 +1,7 @@ PORTNAME= icingaweb2-module-director DISTVERSIONPREFIX= v DISTVERSION= 1.11.1 +PORTREVISION= 1 CATEGORIES= net-mgmt www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} diff --git a/net-mgmt/icingaweb2-module-director/pkg-plist b/net-mgmt/icingaweb2-module-director/pkg-plist index c870274103a7..fe5563c286cf 100644 --- a/net-mgmt/icingaweb2-module-director/pkg-plist +++ b/net-mgmt/icingaweb2-module-director/pkg-plist @@ -181,7 +181,7 @@ %%WWWDIR%%/configuration.php %%WWWDIR%%/contrib/docker-test.sh %%WWWDIR%%/contrib/linux-agent-installer/Icinga2Agent.bash -%%WWWDIR%%/contrib/systemd/%%DIRECTOR_GROUP%%-director.service +%%WWWDIR%%/contrib/systemd/icinga-director.service %%WWWDIR%%/contrib/windows-agent-installer/Icinga2Agent.psm1 %%WWWDIR%%/doc/01-Introduction.md %%WWWDIR%%/doc/02-Installation.md @@ -1156,4 +1156,4 @@ %%WWWDIR%%/test/php/library/Director/Resolver/TemplateTreeTest.php %%WWWDIR%%/test/php/library/Director/Restriction/MatchingFilterTest.php %%WWWDIR%%/test/phpunit-compat.php -@dir /var/run/%%DIRECTOR_GROUP%%-director +@dir(%%DIRECTOR_USER%%,DIRECTOR_GROUP%%,0775) /var/run/icinga-director