File obs-server-2.8-0011-dist-Make-fillup-file-locat... of Package obs-server

Overview Repositories Revisions Requests Users Attributes Meta

File obs-server-2.8-0011-dist-Make-fillup-file-location-and-name-configurable.patch of Package obs-server (Revision b469b3e46bf990e9d24491ccb3ff6643)

Currently displaying revision b469b3e46bf990e9d24491ccb3ff6643 , Show latest

From 440efe581c50246f00748ecdbcca6898eda67268 Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol@infoserver.lv>
Date: Tue, 28 Jun 2016 18:43:08 +0100
Subject: [PATCH] [dist] Make fillup file location and name configurable.

This change introduces OBS_FILLUP_DIR and OBS_FILLUP_FILE configuratoin
variables that specify location and name of instaled fillup file
instead of using hardcoded ones.

Signed-off-by: Oleg Girko <ol@infoserver.lv>
---
 Makefile.include | 2 ++
 dist/Makefile    | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile.include b/Makefile.include
index c2f9bd8..f3696e9 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -8,6 +8,8 @@ OBS_BACKEND_DATA_DIR=/srv/obs
 OBS_DOCUMENT_ROOT=/srv/www/obs
 OBS_API_PREFIX=$(OBS_DOCUMENT_ROOT)/api
 OBS_APIDOCS_PREFIX=$(OBS_DOCUMENT_ROOT)/docs
+OBS_FILLUP_DIR=/var/adm/fillup-templates
+OBS_FILLUP_FILE=sysconfig.obs-server
 
 # TODO: find fix for RH in spec/Makefile
 # This here is preparation for multi distro support
diff --git a/dist/Makefile b/dist/Makefile
index 072fe6a..e2291f8 100644
--- a/dist/Makefile
+++ b/dist/Makefile
@@ -51,10 +51,11 @@ install_logrotate: system_dirs
 	    $(LOGROTATE_CONFIGS:%=$(DESTDIR)/etc/logrotate.d/%)
 
 install_fillups: system_dirs
-	$(INSTALL) -m 0644 sysconfig.obs-server $(DESTDIR)/var/adm/fillup-templates/
+	$(INSTALL) -m 0644 sysconfig.obs-server \
+	    $(DESTDIR)$(OBS_FILLUP_DIR)/$(OBS_FILLUP_FILE)
 	sed -i \
 	    -e 's|/srv/obs|$(OBS_BACKEND_DATA_DIR)|g' \
-	    $(DESTDIR)/var/adm/fillup-templates/sysconfig.obs-server
+	    $(DESTDIR)$(OBS_FILLUP_DIR)/$(OBS_FILLUP_FILE)
 
 install_slp: system_dirs
 	$(INSTALL) -m 644 obs.source_server.reg $(DESTDIR)/etc/slp.reg.d/
@@ -75,7 +76,7 @@ system_dirs:
 	$(INSTALL) -d -m 755 $(DESTDIR)/etc/cron.d/
 	$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)/
 	$(INSTALL) -d -m 755 $(DESTDIR)$(SBINDIR)/
-	$(INSTALL) -d -m 755 $(DESTDIR)/var/adm/fillup-templates
+	$(INSTALL) -d -m 755 $(DESTDIR)$(OBS_FILLUP_DIR)
 	$(INSTALL) -d -m 755 $(DESTDIR)/usr/share/doc/packages/obs-devel
 	$(INSTALL) -d -m 755 $(DESTDIR)/usr/lib/obs/tests/appliance
 
-- 
2.9.4

Places

File obs-server-2.8-0011-dist-Make-fillup-file-location-and-name-configurable.patch of Package obs-server (Revision b469b3e46bf990e9d24491ccb3ff6643)

Places