[Fusionforge-commits] FusionForge branch feature/concurrent-ssh-http-for-scm updated. 97937989563583256b3700fdaaeb24eee1e7b6d0

Roland Mas lolando at fusionforge.org
Fri Dec 5 17:51:04 CET 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, feature/concurrent-ssh-http-for-scm has been updated
       via  97937989563583256b3700fdaaeb24eee1e7b6d0 (commit)
      from  c68a91316cbc63a1caf50916877631e6b99a7271 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 97937989563583256b3700fdaaeb24eee1e7b6d0
Author: Roland Mas <lolando at debian.org>
Date:   Fri Dec 5 17:50:43 2014 +0100

    Cope with git-http-backend not being in the same place on all distros

diff --git a/src/GNUmakefile.defaults b/src/GNUmakefile.defaults
index e930d20..cfa6e1f 100644
--- a/src/GNUmakefile.defaults
+++ b/src/GNUmakefile.defaults
@@ -41,6 +41,7 @@ log_path=$(localstatedir)/log/fusionforge
 # Tools
 INSTALL=install
 CP_R=cp -r --preserve=timestamps
+LN_S=ln -s
 
 # Hard-coded detection of distro-specific Apache configuration
 apache_user=$(shell if [ -e /etc/redhat-release ]; then echo 'apache'; elif [ -e /etc/SuSE-release ]; then echo 'wwwrun'; else echo 'www-data'; fi)
diff --git a/src/plugins/scmgit/GNUmakefile b/src/plugins/scmgit/GNUmakefile
new file mode 100644
index 0000000..078ab49
--- /dev/null
+++ b/src/plugins/scmgit/GNUmakefile
@@ -0,0 +1,11 @@
+include ../../GNUmakefile.defaults
+
+# Detection of distro-specific libexecdir for git-http-backend
+gitlibexecdir=$(shell if [ -e /etc/redhat-release ]; then echo '/usr/libexec'; else echo '/usr/lib'; fi)
+
+all:
+	@echo "No default action"
+
+install:
+	install -d -m 755 $(DESTDIR)$(data_path)/plugins/scmgit/libexec/
+	$(LN_S) $(gitlibexecdir)/git-core/git-http-backend $(DESTDIR)$(pkgdatadir)/plugins/scmgit/libexec/
diff --git a/src/plugins/scmgit/etc/httpd.conf.d/plugin-scmgit.inc b/src/plugins/scmgit/etc/httpd.conf.d/plugin-scmgit.inc
index 0ccc942..5922f13 100644
--- a/src/plugins/scmgit/etc/httpd.conf.d/plugin-scmgit.inc
+++ b/src/plugins/scmgit/etc/httpd.conf.d/plugin-scmgit.inc
@@ -12,8 +12,8 @@
 SetEnv GIT_PROJECT_ROOT {scmgit/repos_path}
 SetEnv GIT_HTTP_EXPORT_ALL
 
-ScriptAlias /anonscm/git/ /usr/lib/git-core/git-http-backend/
-ScriptAliasMatch ^/authscm/[^/]+/git/(.*) /usr/lib/git-core/git-http-backend/$1
+ScriptAlias /anonscm/git/ {core/source_path}/plugins/scmgit/libexec/git-http-backend/
+ScriptAliasMatch ^/authscm/[^/]+/git/(.*) {core/source_path}/plugins/scmgit/libexec/git-http-backend/$1
 
 <LocationMatch "^/authscm/[^/]+/git/">
   AuthType Basic

-----------------------------------------------------------------------

Summary of changes:
 src/GNUmakefile.defaults                              |    1 +
 src/plugins/scmgit/GNUmakefile                        |   11 +++++++++++
 src/plugins/scmgit/etc/httpd.conf.d/plugin-scmgit.inc |    4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 src/plugins/scmgit/GNUmakefile


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list