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 aa2ce9a23b9a959a50e435f37d3db06a5e18fe36 (commit)
from 4c9bd01469bec607af881309b5ed66dc95b446f5 (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=aa2ce9a23b9a959a50e435f37d3db06a5e18fe36
commit aa2ce9a23b9a959a50e435f37d3db06a5e18fe36
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sun Feb 4 17:37:23 2018 +0000
yet another fix to set correctly bin_dir configuration value
diff --git a/src/common/include/User.class.php
b/src/common/include/User.class.php
index ba8f1db..0d8cbd6 100644
--- a/src/common/include/User.class.php
+++ b/src/common/include/User.class.php
@@ -1248,7 +1248,7 @@ class FFUser extends FFError {
$now = time();
$explodedKey = explode(' ', $key);
if (forge_get_config('use_shell_limited')) {
- $key = preg_replace("/^.*ssh-/",
"command=\"".forge_get_config('bin_path')."/limited_ssh.sh\" ssh-", $key);
+ $key = preg_replace("/^.*ssh-/",
"command=\"".forge_get_config('bin_dir')."/limited_ssh.sh\" ssh-", $key);
}
$existingKeys = $this->getAuthorizedKeys();
foreach ($existingKeys as $existingKey) {
diff --git a/src/post-install.d/common/ini.sh b/src/post-install.d/common/ini.sh
index 7e739ac..4646311 100755
--- a/src/post-install.d/common/ini.sh
+++ b/src/post-install.d/common/ini.sh
@@ -34,7 +34,7 @@ case "$1" in
hostname=$(hostname -f || hostname)
if [ ! -e $DESTDIR$config_path/config.ini.d/post-install.ini ]; then \
sed $source_path/templates/post-install.ini \
- -e "s,@web_host@,$hostname," -e "s,@bin_dir@,$bindir," \
+ -e "s,@web_host@,$hostname," -e "s,@bin_dir@,$source_path/bin,"
\
> $DESTDIR$config_path/config.ini.d/post-install.ini; \
fi
-----------------------------------------------------------------------
Summary of changes:
src/common/include/User.class.php | 2 +-
src/post-install.d/common/ini.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
