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, 6.1 has been updated
via 028dc14f2fb0a914d7ebc7983840c099d8ec2f94 (commit)
from 01ee27e12704323265a94272fa7593008af4af82 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=028dc14f2fb0a914d7ebc7983840c099d8ec2f94
commit 028dc14f2fb0a914d7ebc7983840c099d8ec2f94
Author: Franck Villaume <[email protected]>
Date: Mon Apr 22 15:30:15 2019 +0200
fix [#909]: wrong host for icon, stylecheet, js in gitweb integration,
scmgit plugin
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index fa2c51e..4872c15 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -610,12 +610,12 @@ control over it to the project's administrator.");
$rootdir = forge_get_config('repos_path', 'scmgit');
fwrite($f, "\$projectroot = '$rootdir';\n");
fwrite($f, "\$projects_list = '$config_dir/gitweb.list';\n");
- fwrite($f, "\$anon_clone_url = '".
util_make_url('/anonscm/git') . "';\n");
- fwrite($f, "\$logo = '".
util_make_url('/plugins/scmgit/git-logo.png') . "';\n");
- fwrite($f, "\$favicon = '".
util_make_url('/plugins/scmgit/git-favicon.png')."';\n");
- fwrite($f, "\$stylesheet = '".
util_make_url('/plugins/scmgit/gitweb.css')."';\n");
- fwrite($f, "\$javascript = '".
util_make_url('/plugins/scmgit/gitweb.js')."';\n");
- fwrite($f, "\$site_html_head_string = '<script
type=\"text/javascript\" src=\"".
util_make_url('/scripts/iframe-resizer/iframeResizer.contentWindow.js'). "\"
/>';\n");
+ fwrite($f, "\$anon_clone_url =
'".forge_get_config('scm_host').'/anonscm/git'."';\n");
+ fwrite($f, "\$logo =
'".forge_get_config('scm_host').'/plugins/scmgit/git-logo.png'."';\n");
+ fwrite($f, "\$favicon =
'".forge_get_config('scm_host').'/plugins/scmgit/git-favicon.png'."';\n");
+ fwrite($f, "\$stylesheet =
'".forge_get_config('scm_host').'/plugins/scmgit/gitweb.css'."';\n");
+ fwrite($f, "\$javascript =
'".forge_get_config('scm_host').'/plugins/scmgit/gitweb.js'."';\n");
+ fwrite($f, "\$site_html_head_string = '<script
type=\"text/javascript\"
src=\"".forge_get_config('scm_host').'/scripts/iframe-resizer/iframeResizer.contentWindow.js'.
"\" />';\n");
fwrite($f, "\$prevent_xss = 'true';\n");
fwrite($f, "\$site_footer =
'".forge_get_config('source_path')."/plugins/scmgit/www/gitweb_footer.html';\n");
fwrite($f, "\$feature{'actions'}{'default'} = [('project home',
'" .
@@ -624,7 +624,7 @@ control over it to the project's administrator.");
fwrite($f, "\$per_request_config = sub {\n");
- fwrite($f, "push @git_base_url_list, qq,".
util_make_url('/anonscm/git') .",;\n");
+ fwrite($f, "push @git_base_url_list, qq,".
forge_get_config('scm_host').('/anonscm/git') .",;\n");
$protocol = forge_get_config('use_ssl', 'scmgit')? 'https' :
'http';
if (forge_get_config('use_smarthttp', 'scmgit')) {
diff --git a/src/plugins/scmgit/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
b/src/plugins/scmgit/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
index 9026a1d..c55b2bc 100644
--- a/src/plugins/scmgit/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
+++ b/src/plugins/scmgit/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
@@ -9,6 +9,12 @@ SetEnv GIT_HTTP_EXPORT_ALL
Require all granted
</Directory>
+<Directory ${FF__core__source_path}>
+ Require all granted
+</Directory>
+Alias /scripts/iframe-resizer/ ${FF__core__source_path}/vendor/iframe-resizer/
+Alias /plugins/scmgit/ ${FF__core__source_path}/www/plugins/scmgit/
+
# Pass supported URLs to git-http-backend, leave the rest to Apache
# Allows efficiency + directory browsing (debugging) - cf.
git-http-backend(1)
ScriptAliasMatch \
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmgit/common/GitPlugin.class.php | 14 +++++++-------
.../scmgit/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc | 6 ++++++
2 files changed, 13 insertions(+), 7 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
