File obs-server-2.7.1-0005-api-Use-OBS_API_PREFIX-in... of Package obs-server

Overview Repositories Revisions Requests Users Attributes Meta

File obs-server-2.7.1-0005-api-Use-OBS_API_PREFIX-instead-of-explicit-pathname-.patch of Package obs-server

From 81b8380301311f70e91eee758386298fbf5dbf89 Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol@infoserver.lv>
Date: Tue, 28 Jun 2016 01:09:26 +0100
Subject: [PATCH 05/29] [api] Use $OBS_API_PREFIX instead of explicit pathname
 for installing.

This allows installing OBS API correctly when OBS_API_PREFIX variable
defined in Makefile.include has value different than "/srv/www/obs/api".

Signed-off-by: Oleg Girko <ol@infoserver.lv>
---
 src/api/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/api/Makefile b/src/api/Makefile
index 88cd95e..595315b 100644
--- a/src/api/Makefile
+++ b/src/api/Makefile
@@ -48,10 +48,10 @@ log_files:
 	$(foreach logfile,$(OBS_API_LOGS),$(shell touch $(DESTDIR)$(OBS_API_PREFIX)/log/$(logfile) ))
 
 build: config
-	$(shell [ -d $(DESTDIR)/srv/www/obs/api/.bundle ] && rm -rf $(DESTDIR)/srv/www/obs/api/.bundle)
+	$(shell [ -d $(DESTDIR)$(OBS_API_PREFIX)/.bundle ] && rm -rf $(DESTDIR)$(OBS_API_PREFIX)/.bundle)
 	# we need to have *something* as secret key
-	echo "" | sha256sum| cut -d\  -f 1 > $(DESTDIR)/srv/www/obs/api/config/secret.key
-	cd $(DESTDIR)/srv/www/obs/api ;\
+	echo "" | sha256sum| cut -d\  -f 1 > $(DESTDIR)$(OBS_API_PREFIX)/config/secret.key
+	cd $(DESTDIR)$(OBS_API_PREFIX) ;\
 	bundle exec rake assets:precompile RAILS_ENV=production RAILS_GROUPS=assets ;\
 	rm -rf tmp/cache/sass tmp/cache/assets config/secret.key ;\
 	$(OBS_API_BUNDLER_OPTS) bundle config --local frozen 1 ;\
@@ -60,7 +60,7 @@ build: config
 	$(INSTALL) config/database.yml.example $(DESTDIR)$(OBS_API_PREFIX)/config/database.yml
 	# fixed hardlinking problem in SLE 11
 	echo "# This is to prevent fdupes from hardlinking" >> $(DESTDIR)$(OBS_API_PREFIX)/config/database.yml
-	: >  $(DESTDIR)/srv/www/obs/api/log/production.log
+	: >  $(DESTDIR)$(OBS_API_PREFIX)/log/production.log
 	sed -i -e 's,^api_version.*,api_version = "$(OBS_VERSION)",'  $(DESTDIR)$(OBS_API_PREFIX)/config/initializers/02_apiversion.rb
 
 test_unit:
-- 
2.7.4

Places

File obs-server-2.7.1-0005-api-Use-OBS_API_PREFIX-instead-of-explicit-pathname-.patch of Package obs-server

Places