From 0f34ed46d01ad55a2fc73ae6e27d25b69f93c260 Mon Sep 17 00:00:00 2001 From: Matthew Hollick <22219356+matthew-hollick@users.noreply.github.com> Date: Tue, 13 Jun 2023 22:55:41 +0100 Subject: [PATCH 1/3] logrotate: include configuration Not sure why fpm is complaining but the resultant deb and rpm files look good to me. --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c89394bca..daa0c801f 100644 --- a/Makefile +++ b/Makefile @@ -62,6 +62,9 @@ gox-build: ls -la out/ mkdir -p out/root/etc/$(NAME)/ ./out/$(NAME)-linux-amd64 -config-print-default > out/root/etc/$(NAME)/$(NAME).conf + install -D --mode=0644 --owner=root --group=root \ + deploy/root/etc/logrotate.d/graphite-clickhouse \ + out/root/etc/logrotate.d/graphite-clickhouse fpm-deb: $(MAKE) fpm-build-deb ARCH=amd64 @@ -79,8 +82,7 @@ fpm-build-deb: -m $(MAINTAINER) \ --license "MIT" \ -a $(ARCH) \ - --config-files /etc/$(NAME)/$(NAME).conf \ - --config-files /etc/logrotate.d/$(NAME) \ + --config-files /etc \ out/$(NAME)-linux-$(ARCH)=/usr/bin/$(NAME) \ deploy/root/=/ \ out/root/=/ @@ -95,8 +97,7 @@ fpm-build-rpm: -m $(MAINTAINER) \ --license "MIT" \ -a $(ARCH) \ - --config-files /etc/$(NAME)/$(NAME).conf \ - --config-files /etc/logrotate.d/$(NAME) \ + --config-files /etc \ out/$(NAME)-linux-$(ARCH)=/usr/bin/$(NAME) \ deploy/root/=/ \ out/root/=/ From 932f55c54e3b51ed5af657ba7536ad011c9b4f7a Mon Sep 17 00:00:00 2001 From: Michail Safronov Date: Wed, 9 Aug 2023 07:04:41 +0500 Subject: [PATCH 2/3] Update Makefile --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 88ca5a3ce..3976c25e9 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,7 @@ gox-build: install -D --mode=0644 --owner=root --group=root \ deploy/root/etc/logrotate.d/graphite-clickhouse \ out/root/etc/logrotate.d/graphite-clickhouse + fpm-deb: $(MAKE) fpm-build-deb ARCH=amd64 $(MAKE) fpm-build-deb ARCH=arm64 From bf604b31a001fab3455b1986fe9c9b67c5097af7 Mon Sep 17 00:00:00 2001 From: Michail Safronov Date: Wed, 9 Aug 2023 07:56:50 +0500 Subject: [PATCH 3/3] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3976c25e9..220095425 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ gox-build: ls -la out/ mkdir -p out/root/etc/$(NAME)/ ./out/$(NAME)-$(OS)-amd64 -config-print-default > out/root/etc/$(NAME)/$(NAME).conf - install -D --mode=0644 --owner=root --group=root \ + install -D --mode=0644 \ deploy/root/etc/logrotate.d/graphite-clickhouse \ out/root/etc/logrotate.d/graphite-clickhouse