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-5.3 has been updated
via 70bb4293d38d3c228f70df984d93ccc46f0507c0 (commit)
via 20274a58ade0f6f3083adbe3e9e5a6638136f5a1 (commit)
via 3c9c62267bdd79100aa3f0752a6ac5689e5c43e7 (commit)
via ea66eaf7998ed253317cc52a8dab11e27baa1179 (commit)
from 0e7ba9c7b369a1f07c029780ba228588f1e53207 (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 70bb4293d38d3c228f70df984d93ccc46f0507c0
Author: Roland Mas <[email protected]>
Date: Mon May 26 14:20:42 2014 +0200
Use more consistent URL scheme for SCM access over HTTP
diff --git a/src/etc/httpd.conf.d/05-config-macros-scmgit.conf
b/src/etc/httpd.conf.d/05-config-macros-scmgit.conf
index 8d1c0ea..8b640a8 100644
--- a/src/etc/httpd.conf.d/05-config-macros-scmgit.conf
+++ b/src/etc/httpd.conf.d/05-config-macros-scmgit.conf
@@ -1,30 +1,30 @@
<Macro ScmgitProjectWithAnon $project>
-<LocationMatch "^/git/$project/">
+<LocationMatch "^/anonscm/git/$project/">
Require all granted
</LocationMatch>
-<LocationMatch "^/authgit/[^/]+/$project/">
+<LocationMatch "^/authscm/[^/]+/git/$project/">
Require valid-user
</LocationMatch>
</Macro>
<Macro ScmgitProjectWithoutAnon $project>
-<LocationMatch "^/authgit/[^/]+/$project/">
+<LocationMatch "^/authscm/[^/]+/git/$project/">
Require group scm_$project
</LocationMatch>
-<LocationMatch "^/authgit/[^/]+/$project/.*/git-receive-pack$">
+<LocationMatch "^/authscm/[^/]+/git/$project/.*/git-receive-pack$">
AuthMerging And
Require group scm_$project
</LocationMatch>
</Macro>
<Macro ScmgitUser $user>
-<LocationMatch "^/authgit/$user/">
+<LocationMatch "^/authscm/$user/git/">
Require user $user
</LocationMatch>
-<LocationMatch "^/authgit/[^/]/[^/]users/$user/git-receive-pack$">
+<LocationMatch "^/authscm/[^/]/git/[^/]users/$user/git-receive-pack$">
AuthMerging And
Require user $user
</LocationMatch>
diff --git a/src/etc/httpd.conf.d/05-config-macros-scmsvn.conf
b/src/etc/httpd.conf.d/05-config-macros-scmsvn.conf
index 706ab61..8f1d725 100644
--- a/src/etc/httpd.conf.d/05-config-macros-scmsvn.conf
+++ b/src/etc/httpd.conf.d/05-config-macros-scmsvn.conf
@@ -1,5 +1,5 @@
<Macro ScmsvnProjectWithAnon $project>
-<Location /svn/$project>
+<Location /anonscm/svn/$project>
DAV svn
SVNPath {scmsvn/repos_path}/$project
# allow read-only browsing
@@ -9,7 +9,7 @@
</Macro>
<Macro ScmsvnUser $user>
-<Location /authsvn/$user>
+<Location /authscm/$user/svn>
DAV svn
SVNParentPath {scmsvn/repos_path}
diff --git a/src/etc/httpd.conf.d/plugin-scmgit.inc
b/src/etc/httpd.conf.d/plugin-scmgit.inc
index 7b406fd..321b3b6 100644
--- a/src/etc/httpd.conf.d/plugin-scmgit.inc
+++ b/src/etc/httpd.conf.d/plugin-scmgit.inc
@@ -5,10 +5,10 @@
SetEnv GIT_PROJECT_ROOT {scmgit/repos_path}
SetEnv GIT_HTTP_EXPORT_ALL
-ScriptAlias /git/ /usr/lib/git-core/git-http-backend/
-ScriptAliasMatch ^/authgit/[^/]+/(.*) /usr/lib/git-core/git-http-backend/$1
+ScriptAlias /anonscm/git/ /usr/lib/git-core/git-http-backend/
+ScriptAliasMatch ^/authscm/[^/]+/git/(.*) /usr/lib/git-core/git-http-backend/$1
-<LocationMatch "^/authgit/">
+<LocationMatch "^/authscm/[^/]+/git/">
AuthType Basic
AuthName "SCM for {core/forge_name}"
AuthUserFile {core/data_path}/scmgit-userfile
diff --git a/src/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
b/src/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
index 0b81fc4..a6a6d94 100644
--- a/src/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
+++ b/src/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc
@@ -1,2 +1,2 @@
-SetEnvIf Request_URI ^/authgit/([^/]+)/ ITKUID=$1
-SetEnvIf Request_URI ^/authgit/([^/]+)/([^/]+)/ ITKGID=$2
+SetEnvIf Request_URI ^/authscm/([^/]+)/git/ ITKUID=$1
+SetEnvIf Request_URI ^/authscm/([^/]+)/git/([^/]+)/ ITKGID=$2
diff --git a/src/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
b/src/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
index 1925dd1..e0e1c96 100644
--- a/src/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
+++ b/src/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc
@@ -1,2 +1,2 @@
-SetEnvIf Request_URI ^/authsvn/([^/]+)/ ITKUID=$1
-SetEnvIf Request_URI ^/authsvn/([^/]+)/([^/]+)/ ITKGID=$2
+SetEnvIf Request_URI ^/authscm/([^/]+)/svn/ ITKUID=$1
+SetEnvIf Request_URI ^/authscm/([^/]+)/svn/([^/]+)/ ITKGID=$2
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index c9fec44..c8251de 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -102,7 +102,7 @@ class GitPlugin extends SCMPlugin {
$clone_commands[] = 'git clone
'.util_make_url('/anonscm/git/'.$project->getUnixName().'/'.$repo_name.'.git');
if (forge_get_config('use_smarthttp', 'scmgit')) {
$protocol = forge_get_config('use_ssl',
'scmgit')? 'https' : 'http';
- $clone_commands[] = 'git clone
'.$protocol.'://'.forge_get_config('scm_host').'/git/'.$project->getUnixName().'/'.$repo_name.'.git';
+ $clone_commands[] = 'git clone
'.$protocol.'://'.forge_get_config('scm_host').'/anonscm/git/'.$project->getUnixName().'/'.$repo_name.'.git';
}
}
@@ -203,7 +203,7 @@ class GitPlugin extends SCMPlugin {
$b .= '</p>';
$protocol = forge_get_config('use_ssl',
'scmgit')? 'https' : 'http';
foreach ($repo_list as $repo_name) {
- $b .= '<p><tt>git clone
'.$protocol.'://'.$d.'@' .
forge_get_config('scm_host').'/authgit/'.$d.'/'.$project->getUnixName() .'/'.
$repo_name .'.git</tt></p>';
+ $b .= '<p><tt>git clone
'.$protocol.'://'.$d.'@' .
forge_get_config('scm_host').'/authscm/'.$d.'/git/'.$project->getUnixName()
.'/'. $repo_name .'.git</tt></p>';
}
}
if (forge_get_config('use_dav', 'scmgit')) {
@@ -261,7 +261,7 @@ class GitPlugin extends SCMPlugin {
$b .= '</p>';
$protocol = forge_get_config('use_ssl',
'scmgit')? 'https' : 'http';
foreach ($repo_list as $repo_name) {
- $b .= '<p><tt>git clone
'.$protocol.'://<i>'._('developername').'</i>@' .
forge_get_config('scm_host').'/authgit/<i>'._('developername').'</i>/'.$project->getUnixName()
.'/'. $repo_name .'.git</tt></p>';
+ $b .= '<p><tt>git clone
'.$protocol.'://<i>'._('developername').'</i>@' .
forge_get_config('scm_host').'/authscm/<i>'._('developername').'</i>/git/'.$project->getUnixName()
.'/'. $repo_name .'.git</tt></p>';
}
}
if (forge_get_config('use_dav', 'scmgit')) {
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index ab538b4..64ffe5d 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -116,7 +116,7 @@ class SVNPlugin extends SCMPlugin {
$b .= '<tt>svn checkout
svn://'.$this->getBoxForProject($project).$this->svn_root_fs.'/'.$project->getUnixName().$module.'</tt><br
/>';
}
if (forge_get_config('use_dav', 'scmsvn')) {
- $b .= '<p><tt>svn checkout
http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' : '').'://'.
forge_get_config('scm_host').
'/svn/'.$project->getUnixName().$module.'</tt></p>' ;
+ $b .= '<p><tt>svn checkout
http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' : '').'://'.
forge_get_config('scm_host').
'/anonscm/svn/'.$project->getUnixName().$module.'</tt></p>' ;
}
$b .= '</p>';
return $b;
@@ -152,7 +152,7 @@ class SVNPlugin extends SCMPlugin {
$b .= ' ';
$b .= _('Enter your site password when
prompted.');
$b .= '</p>';
- $b .= '<p><tt>svn checkout --username '.$d.'
http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' : '').'://'.
forge_get_config('scm_host').
'/authsvn/'.$d.'/'.$project->getUnixName().$module.'</tt></p>' ;
+ $b .= '<p><tt>svn checkout --username '.$d.'
http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' : '').'://'.
forge_get_config('scm_host').
'/authscm/'.$d.'/svn/'.$project->getUnixName().$module.'</tt></p>' ;
}
} else {
if (forge_get_config('use_ssh', 'scmsvn')) {
@@ -181,7 +181,7 @@ class SVNPlugin extends SCMPlugin {
$b .= ' ';
$b .= _('Enter your site password when
prompted.');
$b .= '</p>';
- $b .= '<p><tt>svn checkout --username
<i>'._('developername').'</i> http'.((forge_get_config('use_ssl', 'scmsvn')) ?
's' : '').'://'. forge_get_config('scm_host').
'/authsvn/<i>'._('developername').'</i>/'.$project->getUnixName().$module.'</tt></p>'
;
+ $b .= '<p><tt>svn checkout --username
<i>'._('developername').'</i> http'.((forge_get_config('use_ssl', 'scmsvn')) ?
's' : '').'://'. forge_get_config('scm_host').
'/authscm/<i>'._('developername').'</i>/svn/'.$project->getUnixName().$module.'</tt></p>'
;
}
}
return $b;
commit 20274a58ade0f6f3083adbe3e9e5a6638136f5a1
Author: Roland Mas <[email protected]>
Date: Fri May 23 16:18:41 2014 +0200
Fixes to the Apache config for scmsvn
diff --git a/src/etc/httpd.conf.d/05-config-macros-scmsvn.conf
b/src/etc/httpd.conf.d/05-config-macros-scmsvn.conf
index e07f375..706ab61 100644
--- a/src/etc/httpd.conf.d/05-config-macros-scmsvn.conf
+++ b/src/etc/httpd.conf.d/05-config-macros-scmsvn.conf
@@ -1,21 +1,11 @@
<Macro ScmsvnProjectWithAnon $project>
-<LocationMatch "^/svn/$project/">
+<Location /svn/$project>
DAV svn
SVNPath {scmsvn/repos_path}/$project
# allow read-only browsing
<LimitExcept GET PROPFIND OPTIONS REPORT>
</LimitExcept>
-</LocationMatch>
-
-# Use ScmsvnProjectWithoutAnon $project
-</Macro>
-
-<Macro ScmsvnProjectWithoutAnon $project>
-# <LocationMatch "^/authsvn/[^/]+/$project/">
-# DAV svn
-# SVNPath {scmsvn/repos_path}/$project
-# AuthzSVNAccessFile {core/data_path}/svnroot-access
-# </LocationMatch>
+</Location>
</Macro>
<Macro ScmsvnUser $user>
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 2a12cc1..ab538b4 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -377,9 +377,6 @@ class SVNPlugin extends SCMPlugin {
if ($project->enableAnonSCM()) {
fwrite($config_f, 'Use ScmsvnProjectWithAnon
'.$project->getUnixName().'
');
- } else {
- fwrite($config_f, 'Use ScmsvnProjectWithoutAnon
'.$project->getUnixName().'
-');
}
fwrite($config_f, "\n");
commit 3c9c62267bdd79100aa3f0752a6ac5689e5c43e7
Author: Roland Mas <[email protected]>
Date: Fri May 23 16:23:04 2014 +0200
Use new URL in instructions for anonymous SVN, removed old config file
diff --git a/src/etc/httpd.conf.d/plugin-scmsvn.inc
b/src/etc/httpd.conf.d/plugin-scmsvn.inc
deleted file mode 100644
index 6b9cd5f..0000000
--- a/src/etc/httpd.conf.d/plugin-scmsvn.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-<Location /foosvn>
- <IfModule mod_dav_svn.c>
- DAV svn
- SVNParentPath {scmsvn/repos_path}
-
- <IfModule mod_authz_svn.c>
- # how to authenticate a user
- AuthzSVNAccessFile {core/data_path}/svnroot-access
- AuthType Basic
- AuthName "Document repository"
- AuthUserFile {core/data_path}/svnroot-authfile
-
- # only authenticated users may access the repository
- Require valid-user
- </IfModule>
- <IfModule !mod_authz_svn.c>
- # allow read-only browsing
- <LimitExcept GET PROPFIND OPTIONS REPORT>
- </LimitExcept>
- </IfModule>
- </IfModule>
-</Location>
-
-<LocationMatch "^/authsvn/">
- <IfModule mod_authz_svn.c>
- # how to authenticate a user
- AuthzSVNAccessFile {core/data_path}/svnroot-access
- AuthType Basic
- AuthName "SCM for {core/forge_name}"
- AuthUserFile {core/data_path}/svnroot-authfile
-
- # only authenticated users may access the repository
- Require valid-user
- </IfModule>
-</LocationMatch>
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 0e59e84..2a12cc1 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -116,8 +116,7 @@ class SVNPlugin extends SCMPlugin {
$b .= '<tt>svn checkout
svn://'.$this->getBoxForProject($project).$this->svn_root_fs.'/'.$project->getUnixName().$module.'</tt><br
/>';
}
if (forge_get_config('use_dav', 'scmsvn')) {
- $b .= '<tt>svn checkout --username
'.forge_get_config('anonsvn_login', 'scmsvn').'
http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' : '').'://' .
$this->getBoxForProject($project). $this->svn_root_dav .'/'.
$project->getUnixName() .$module.'</tt><br />';
- $b .= _('The password is
').forge_get_config('anonsvn_password', 'scmsvn').'<br />';
+ $b .= '<p><tt>svn checkout
http'.((forge_get_config('use_ssl', 'scmsvn')) ? 's' : '').'://'.
forge_get_config('scm_host').
'/svn/'.$project->getUnixName().$module.'</tt></p>' ;
}
$b .= '</p>';
return $b;
commit ea66eaf7998ed253317cc52a8dab11e27baa1179
Author: Roland Mas <[email protected]>
Date: Fri May 23 16:12:56 2014 +0200
Fixed instructions for HTTPS access when not logged in
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index ec63674..0e59e84 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -182,7 +182,7 @@ class SVNPlugin extends SCMPlugin {
$b .= ' ';
$b .= _('Enter your site password when
prompted.');
$b .= '</p>';
- $b .= '<p><tt>svn checkout --username
<i>'._('developername').'</i> http'.((forge_get_config('use_ssl', 'scmsvn')) ?
's' : '').'://'. $this->getBoxForProject($project) . $this->svn_root_dav
.'/'.$project->getUnixName().$module.'</tt></p>' ;
+ $b .= '<p><tt>svn checkout --username
<i>'._('developername').'</i> http'.((forge_get_config('use_ssl', 'scmsvn')) ?
's' : '').'://'. forge_get_config('scm_host').
'/authsvn/<i>'._('developername').'</i>/'.$project->getUnixName().$module.'</tt></p>'
;
}
}
return $b;
-----------------------------------------------------------------------
Summary of changes:
src/etc/httpd.conf.d/05-config-macros-scmgit.conf | 12 +++----
src/etc/httpd.conf.d/05-config-macros-scmsvn.conf | 16 ++--------
src/etc/httpd.conf.d/plugin-scmgit.inc | 6 ++--
src/etc/httpd.conf.d/plugin-scmsvn.inc | 35 ---------------------
src/etc/httpd.conf.d/vhost-scm-plugin-scmgit.inc | 4 +--
src/etc/httpd.conf.d/vhost-scm-plugin-scmsvn.inc | 4 +--
src/plugins/scmgit/common/GitPlugin.class.php | 6 ++--
src/plugins/scmsvn/common/SVNPlugin.class.php | 10 ++----
8 files changed, 22 insertions(+), 71 deletions(-)
delete mode 100644 src/etc/httpd.conf.d/plugin-scmsvn.inc
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
