diff --git a/Makefile b/Makefile index 995542a..8f5a685 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ URL = "https://git.netoik.io/$(OWNER)/$(NAME)" SOURCE0 = "$(NAME)-$(VERSION)-$(RELEASE).tar.gz" RPM_RPMDIR = $(shell rpm --eval '%{_rpmdir}') +RPM_RUNDIR = $(shell rpm --eval '%{_rundir}') RPM_SBINDIR = $(shell rpm --eval '%{_sbindir}') RPM_SOURCEDIR = $(shell rpm --eval '%{_sourcedir}') RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}') @@ -73,7 +74,7 @@ install: ## Install files into rpm dest (requires env var DESTDIR) printf "[CRITICAL] Missing env var DESTDIR\n[CRITICAL] This command is designed to be called by rpmbuild only!\n" 1>&2; \ exit 1; \ fi - install --mode=755 --directory $(DESTDIR)$(RPM_SYSCONFDIR)/postgres $(DESTDIR)$(RPM_UNITDIR)/postgresql.service.d + install --mode=755 --directory $(DESTDIR)$(RPM_RUNDIR)/postgresql $(DESTDIR)$(RPM_SYSCONFDIR)/postgres $(DESTDIR)$(RPM_UNITDIR)/postgresql.service.d install --mode=644 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/postgres files/postgres/postgresql.conf files/postgres/pg_hba.conf install --mode=644 --target-directory=$(DESTDIR)$(RPM_UNITDIR)/postgresql.service.d files/systemd/postgres.conf diff --git a/netoik-db.spec b/netoik-db.spec index fdb4902..46b42f7 100644 --- a/netoik-db.spec +++ b/netoik-db.spec @@ -23,7 +23,6 @@ Install the database management system called postgresql with a predefined confi %post # Create sock directory if not existing -mkdir --parents --mode 755 "%{_rundir}/postgresql" chown postgres:postgres "%{_rundir}/postgresql" # Restart services @@ -39,5 +38,7 @@ systemctl restart postgresql.service %dir %attr(755, root, root) %{_unitdir}/postgresql.service.d %attr(644, root, root) %{_unitdir}/postgresql.service.d/postgres.conf +%dir %attr(755, -, -) %{_rundir}/postgresql + %changelog %autochangelog