File obs-server-2.10-0012-dist-Make-fillup-file-loca... of Package obs-server

Overview Repositories Revisions Requests Users Attributes Meta

File obs-server-2.10-0012-dist-Make-fillup-file-location-and-name-configurable.patch of Package obs-server

From bfca98288229a4a3cba53482ddeeb00505132f52 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 4c1a246715..33a74356f9 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -7,6 +7,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 6275b29ae9..cbacffed2f 100644
--- a/dist/Makefile
+++ b/dist/Makefile
@@ -7,7 +7,7 @@ SYSTEMD_TARGET_FILES  := obs-api-support
 SYSTEMD_SERVICE_FILES := obs-clockwork obs-delayedjob-queue-project_log_rotate obs-delayedjob-queue-consistency_check obs-delayedjob-queue-default obs-delayedjob-queue-releasetracking obs-delayedjob-queue-issuetracking obs-delayedjob-queue-mailers obs-delayedjob-queue-staging obs-sphinx obsdeltastore obsdispatcher obsdodup obswarden obssrcserver obsrepserver obspublisher obssigner obsservice obsservicedispatch obsgetbinariesproxy obsclouduploadserver obsclouduploadworker obsscheduler obsworker obsstoragesetup obsapisetup obsnotifyforward obsredis
 SYSTEMD_SERVICE_FILES_WITHOUT_LINK := obs-delayedjob-queue-quick@
 
-FILLUPDIR             := /var/adm/fillup-templates
+FILLUPDIR             := $(OBS_FILLUP_DIR)
 
 UNITDIR=/usr/lib/systemd/system/
 
@@ -57,10 +57,11 @@ install_logrotate: system_dirs
 	    $(LOGROTATE_CONFIGS:%=$(DESTDIR)/etc/logrotate.d/%)
 
 install_fillups: system_dirs
-	$(INSTALL) -m 0644 sysconfig.obs-server $(DESTDIR)$(FILLUPDIR)
+	$(INSTALL) -m 0644 sysconfig.obs-server \
+	    $(DESTDIR)$(FILLUPDIR)/$(OBS_FILLUP_FILE)
 	sed -i \
 	    -e 's|/srv/obs|$(OBS_BACKEND_DATA_DIR)|g' \
-	    $(DESTDIR)$(FILLUPDIR)/sysconfig.obs-server
+	    $(DESTDIR)$(FILLUPDIR)/$(OBS_FILLUP_FILE)
 
 install_slp: system_dirs
 	$(INSTALL) -m 644 obs.source_server.reg $(DESTDIR)/etc/slp.reg.d/
-- 
2.35.3

Places

File obs-server-2.10-0012-dist-Make-fillup-file-location-and-name-configurable.patch of Package obs-server

Places