File obs-server-2.7.1-0011-api-Use-absolute-pathname... of Package obs-server

Overview Repositories Revisions Requests Users Attributes Meta

File obs-server-2.7.1-0011-api-Use-absolute-pathnames-for-apidocs-in-config-env.patch of Package obs-server (Revision a54184d12a5b83bb4ed61fe52fa6ec1e)

Currently displaying revision a54184d12a5b83bb4ed61fe52fa6ec1e , Show latest

From 869084f6893a4ce4f70eb7d2ac17c5dfa920e3ee Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol@infoserver.lv>
Date: Tue, 28 Jun 2016 18:29:12 +0100
Subject: [PATCH 11/29] [api] Use absolute pathnames for apidocs in
 "config/environment.rb".

API docs pathname is configured by OBS_APIDOCS_PREFIX variable
from Makefile.include file and is not guaranteed to be in
specific place relative to OBS_API_PREFIX.
Hence, full pathname is needed instead of assuming relative location.

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

diff --git a/src/api/Makefile b/src/api/Makefile
index 595315b..a94d13c 100644
--- a/src/api/Makefile
+++ b/src/api/Makefile
@@ -28,8 +28,8 @@ docs:
 	cp -av ../../docs/api/api $(DESTDIR)$(OBS_APIDOCS_PREFIX)
 	cp -av ../../docs/api/html/* $(DESTDIR)$(OBS_APIDOCS_PREFIX)/api/html/
 	ln -sf $(OBS_APIDOCS_PREFIX)/api/ $(DESTDIR)$(OBS_API_PREFIX)/public/schema
-	echo 'CONFIG["apidocs_location"] ||= File.expand_path("../docs/api/html/")' >> $(DESTDIR)$(OBS_API_PREFIX)/config/environment.rb
-	echo 'CONFIG["schema_location"] ||= File.expand_path("../docs/api/")' >> $(DESTDIR)$(OBS_API_PREFIX)/config/environment.rb
+	echo 'CONFIG["apidocs_location"] ||= File.expand_path("$(OBS_APIDOCS_PREFIX)/api/html/")' >> $(DESTDIR)$(OBS_API_PREFIX)/config/environment.rb
+	echo 'CONFIG["schema_location"] ||= File.expand_path("$(OBS_APIDOCS_PREFIX)/api/")' >> $(DESTDIR)$(OBS_API_PREFIX)/config/environment.rb
 
 config: prepare_dirs
 	# we need config also in building environment, otherwise rake will break
-- 
2.7.4

Places

File obs-server-2.7.1-0011-api-Use-absolute-pathnames-for-apidocs-in-config-env.patch of Package obs-server (Revision a54184d12a5b83bb4ed61fe52fa6ec1e)

Places