diff mbox series

Core Update 165: Rename squid-accounting add-on to proxy-accounting

Message ID 451ff4eb-49ae-79ef-aaf0-71e086b7c9b9@ipfire.org
State Superseded
Headers
Series Core Update 165: Rename squid-accounting add-on to proxy-accounting |

Commit Message

Peter Müller Feb. 28, 2022, 8:32 p.m. UTC 
  https://lists.ipfire.org/pipermail/development/2022-February/012482.html

Cc: Michael Tremer <michael.tremer@ipfire.org>
Cc: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/rootfiles/core/165/update.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

Comments

Michael Tremer March 1, 2022, 10:39 a.m. UTC | #1 
Hello,

> On 28 Feb 2022, at 20:32, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> https://lists.ipfire.org/pipermail/development/2022-February/012482.html
> 
> Cc: Michael Tremer <michael.tremer@ipfire.org>
> Cc: Adolf Belka <adolf.belka@ipfire.org>
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> ---
> config/rootfiles/core/165/update.sh | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
> 
> diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/core/165/update.sh
> index fe4449fff..c0939bce6 100644
> --- a/config/rootfiles/core/165/update.sh
> +++ b/config/rootfiles/core/165/update.sh
> @@ -97,6 +97,18 @@ rm -rvf \
> 	/var/ipfire/dhcpc/dhcpcd-hooks/10-mtu \
> 	/var/ipfire/firewall/p2protocols
> 
> +# Rename squid-accounting add-on to proxy-accounting, if installed
> +# (see: https://lists.ipfire.org/pipermail/development/2022-February/012482.html)
> +if [ -e "/opt/pakfire/db/installed/meta-squid-accounting" ] && [ -e "/opt/pakfire/db/meta/meta-squid-accounting" ]; then
> +	stop_service squid-accounting

Is this even a service?

-Michael

> +
> +	mv -v /opt/pakfire/db/installed/meta-squid-accounting /opt/pakfire/db/installed/meta-proxy-accounting
> +	mv -v /opt/pakfire/db/meta/meta-squid-accounting /opt/pakfire/db/meta/meta-proxy-accounting
> +	mv -v /opt/pakfire/db/rootfiles/squid-accounting /opt/pakfire/db/rootfiles/proxy-accounting
> +
> +	start_service proxy-accounting
> +fi
> +
> # Stop services
> 
> # Extract files
> -- 
> 2.34.1
diff mbox series

Patch

diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/core/165/update.sh
index fe4449fff..c0939bce6 100644
--- a/config/rootfiles/core/165/update.sh
+++ b/config/rootfiles/core/165/update.sh
@@ -97,6 +97,18 @@  rm -rvf \
 	/var/ipfire/dhcpc/dhcpcd-hooks/10-mtu \
 	/var/ipfire/firewall/p2protocols
 
+# Rename squid-accounting add-on to proxy-accounting, if installed
+# (see: https://lists.ipfire.org/pipermail/development/2022-February/012482.html)
+if [ -e "/opt/pakfire/db/installed/meta-squid-accounting" ] && [ -e "/opt/pakfire/db/meta/meta-squid-accounting" ]; then
+	stop_service squid-accounting
+
+	mv -v /opt/pakfire/db/installed/meta-squid-accounting /opt/pakfire/db/installed/meta-proxy-accounting
+	mv -v /opt/pakfire/db/meta/meta-squid-accounting /opt/pakfire/db/meta/meta-proxy-accounting
+	mv -v /opt/pakfire/db/rootfiles/squid-accounting /opt/pakfire/db/rootfiles/proxy-accounting
+
+	start_service proxy-accounting
+fi
+
 # Stop services
 
 # Extract files