From patchwork Mon Nov 23 12:08:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3674 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4CfmD50CBrz3wpp for ; Mon, 23 Nov 2020 12:09:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4CfmD33T4Qz1Gw; Mon, 23 Nov 2020 12:09:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4CfmD30K1yz2yTN; Mon, 23 Nov 2020 12:09:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4CfmD16cBTz2xCY for ; Mon, 23 Nov 2020 12:09:21 +0000 (UTC) Received: from smtpq3.tb.mail.iss.as9143.net (smtpq3.tb.mail.iss.as9143.net [212.54.42.166]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4CfmD05bRRzWn for ; Mon, 23 Nov 2020 12:09:20 +0000 (UTC) Received: from [212.54.42.110] (helo=smtp7.tb.mail.iss.as9143.net) by smtpq3.tb.mail.iss.as9143.net with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khAem-000261-Bi; Mon, 23 Nov 2020 13:09:20 +0100 Received: from j103033.upc-j.chello.nl ([24.132.103.33] helo=rhea.saturn.pimb.org) by smtp7.tb.mail.iss.as9143.net with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1khAel-00410T-G1; Mon, 23 Nov 2020 13:09:19 +0100 Received: from hyperion.saturn.pimb.org (hyperion.saturn.pimb.org [192.168.26.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by rhea.saturn.pimb.org (Postfix) with ESMTPSA id 7E7B23EF3; Mon, 23 Nov 2020 13:09:20 +0100 (CET) From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] apcupsd: addition of backup/includes definition Date: Mon, 23 Nov 2020 13:08:48 +0100 Message-Id: <20201123120848.3687398-1-ahb.ipfire@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-SourceIP: 24.132.103.33 X-Authenticated-Sender: adolf.belka@ziggo.nl (via SMTP) X-Ziggo-spambar: / X-Ziggo-spamscore: 0.0 X-Ziggo-spamreport: CMAE Analysis: v=2.4 cv=DJcxXwBb c=1 sm=1 tr=0 ts=5fbba66f a=N0UC3/faf55XGTeY5t7zSQ==:17 a=9+rZDBEiDlHhcck0kWbJtElFXBc=:19 a=x7bEGLp0ZPQA:10 a=6yxbeI8x3IIA:10 a=nNwsprhYR40A:10 a=pGLkceISAAAA:8 a=GSIVkXa9Szxu4zRmR2wA:9 X-Ziggo-Spam-Status: No X-Spam-Status: No X-Spam-Flag: No ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; spf=softfail (mail01.ipfire.org: 212.54.42.166 is neither permitted nor denied by domain of ahbipfire@gmail.com) smtp.mailfrom=ahbipfire@gmail.com ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1606133360; a=rsa-sha256; cv=none; b=F7FK3kYjLp6s8kK4BFOUMtcgbovgTWSuSlkt7Al+112DoXI9RSW77N3eA1NO8+zOSdt8/J 4Y22+/4Dp//Oho9W2OYzsK+aaoqB+yW0ixEzizpuu+5cFoF2CPyn86kktKN099rjzEudkW UJ3hyKXqYj8eQZgXU7RAQNVn5CI/SGkkK+2QY0be9hYEBIHb39ZsA4Z9yXs3jxVeXNshRC dtqsM8Nt9L/Vu/LJ1KFJiFJdHvhC5IcdgXxcJSDzrIH5AeU6GkWXFv87x7uhQazP5kB6Oz NKkxX0U/TNpOuicG+opt2n97qbabVnwDrdT3TTVp2YUaL/r+ooDGF5imbueKTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1606133360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=tRbkzxYwRKRzgyIqW4KTfBwHN36SRtbBNMqs6Lw10J0=; b=Z4LemW85vnteo0hua5sQTA8ZA4LDj59YT6hDjIes1/ZpKvMJR+ZPFdQMD6hptgFml8GLI6 tqggE747isDX3Cba5v/RyTXDOoCnP2lVnioUogUmKGfZZOn03nz6u8SfMuVszsW2hcUyFP 8eFpi/mGkU1gPB3RQ2H1TCMCi/bbKufGrQ1I3OqqMiIxKPYaRf36YRKiw+RYbtHDz/ha8L v+vogsOXvcuDub5yrWxH+Lgwpa9M+h+o/GcVfaYpJLTygxGTeowwos0uFEWsB4IuY7eRhC US71gsIY/nYolwDHi4rmav0l7R/M6PAHsaZKbp3TIxP6a3uYNlmtQ4gzBmM0kg== X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-0.16 / 11.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_MISSING_CHARSET(2.50)[]; RWL_MAILSPIKE_GOOD(0.00)[212.54.42.166:from]; IP_REPUTATION_HAM(-0.06)[asn: 33915(-0.03), country: NL(0.00), ip: 212.54.42.166(0.00)]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(0.00)[~all]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; RCVD_COUNT_THREE(0.00)[4]; RCPT_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:33915, ipnet:212.54.32.0/20, country:NL]; R_DKIM_NA(0.00)[]; HAS_X_AS(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[212.54.42.166:from]; TAGGED_FROM(0.00)[]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; BAYES_HAM(-3.00)[99.99%]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RECEIVED_SPAMHAUS_PBL(0.00)[24.132.103.33:received]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM(-1.00)[-1.000]; FREEMAIL_CC(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] X-Rspamd-Queue-Id: 4CfmD05bRRzWn Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mail01.ipfire.org: 212.54.42.166 is neither permitted nor denied by domain of ahbipfire@gmail.com) smtp.mailfrom=ahbipfire@gmail.com X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Added a backup/includes file for apcupsd to backup the /etc/apcupsd/ directory where all the configuration files are stored. Currently there is no backup available to save the state of any changes carried out to the configuration or action files. Signed-off-by: Adolf Belka --- config/backup/includes/apcupsd | 1 + config/rootfiles/packages/apcupsd | 1 + lfs/apcupsd | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 config/backup/includes/apcupsd diff --git a/config/backup/includes/apcupsd b/config/backup/includes/apcupsd new file mode 100644 index 000000000..82dcd84ed --- /dev/null +++ b/config/backup/includes/apcupsd @@ -0,0 +1 @@ +/etc/apcupsd/ diff --git a/config/rootfiles/packages/apcupsd b/config/rootfiles/packages/apcupsd index b58ed2b47..a28c961eb 100644 --- a/config/rootfiles/packages/apcupsd +++ b/config/rootfiles/packages/apcupsd @@ -33,3 +33,4 @@ srv/web/ipfire/cgi-bin/upsstats.cgi #usr/share/man/man8/apcupsd.8 etc/rc.d/init.d/apcupsd var/ipfire/menu.d/EX-apcupsd.menu +var/ipfire/backup/addons/includes/apcupsd diff --git a/lfs/apcupsd b/lfs/apcupsd index 22818eda5..6240015d1 100644 --- a/lfs/apcupsd +++ b/lfs/apcupsd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = apcupsd -PAK_VER = 6 +PAK_VER = 7 DEPS = @@ -88,5 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -sf ../init.d/apcupsd /etc/rc.d/rc3.d/S65apcupsd ln -sf ../init.d/apcupsd /etc/rc.d/rc0.d/K35apcupsd ln -sf ../init.d/apcupsd /etc/rc.d/rc6.d/K35apcupsd + install -v -m 644 ${DIR_SRC}/config/backup/includes/apcupsd \ + /var/ipfire/backup/addons/includes/apcupsd @rm -rf $(DIR_APP) @$(POSTBUILD)