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, master has been updated
via 1f935eaf75ae965ac52eb2c114c7c28e55dc45af (commit)
via dc0b0b5de0b96acdb2a47aede40172718896143e (commit)
via 3e3f2d28012dfe1ace54da808804a8aa1b885a86 (commit)
via 3a5ba11032d9e4359cc5a1a72c399dde83c453e1 (commit)
via 78e0392ff9d8ba0e81501ea40cf80bedee7b12e6 (commit)
via 091098c7bdcc6d63f87e6bf02aaf8cb2ad19f224 (commit)
via 177f9a097fcfe559e96359f2af7a127d9edc2441 (commit)
from 744dd616c5e9fb3a923283e4cc5ecec4f3aef22f (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=1f935eaf75ae965ac52eb2c114c7c28e55dc45af
commit 1f935eaf75ae965ac52eb2c114c7c28e55dc45af
Author: Franck Villaume <[email protected]>
Date: Sat Jul 8 17:33:28 2017 +0200
align configuration + coding style
diff --git a/src/cronjobs/ftp/ftp_create_group_access.php
b/src/cronjobs/ftp/ftp_create_group_access.php
index a76bbdb..ca729cc 100755
--- a/src/cronjobs/ftp/ftp_create_group_access.php
+++ b/src/cronjobs/ftp/ftp_create_group_access.php
@@ -24,12 +24,10 @@
require_once $gfcommon.'include/pre.php';
require $gfcommon.'include/cron_utils.php';
-
$users = array();
-$chroot_dir = forge_get_config('chroot');
-$ftp_dir = forge_get_config('ftp_upload_dir')."/pub/";
-$home_dir = $chroot_dir.forge_get_config('homedir_prefix')."/";
+$ftp_dir = forge_get_config('ftp_upload_dir');
+$home_dir = forge_get_config('homedir_prefix');
$res_db = db_query_params ('SELECT user_id FROM users WHERE unix_status=$1',
array ('A'));
@@ -40,26 +38,26 @@ if ($res_db) {
}
foreach ($users as $u) {
- $dir = "$home_dir".$u->getUnixName()."/pub";
+ $dir = $home_dir.'/'.$u->getUnixName().'/pub';
if (is_dir("$home_dir".$u->getUnixName())) {
foreach ($u->getGroups() as $project) {
- $g = $project->getUnixName() ;
- if (is_dir("$ftp_dir"."$g")) {
- if (is_dir("$dir/$g")) {
- $cmd = "/bin/umount $dir/$g";
+ $g = $project->getUnixName();
+ if (is_dir($ftp_dir.'/'.$g)) {
+ if (is_dir($dir.'/'.$g)) {
+ $cmd = '/bin/umount '.$dir.'/'.$g;
$res = execute($cmd);
- $cmd = "/bin/rmdir $dir/$g";
+ $cmd = '/bin/rmdir '.$dir.'/'.$g;
$res = execute($cmd);
}
if (!is_dir($dir)) {
- $cmd = "/bin/mkdir $dir";
+ $cmd = '/bin/mkdir '.$dir;
$res = execute($cmd);
}
- $cmd = "/bin/mkdir $dir/$g";
+ $cmd = '/bin/mkdir '.$dir.'/'.$g;
$res = execute($cmd);
- $cmd = "/bin/mount --bind $ftp_dir"."$g
$dir/$g";
+ $cmd = '/bin/mount --bind '.$ftp_dir.'/'.$g
$dir.'/'.$g;
$res = execute($cmd);
- echo "allow ".$u->getUnixName()." to access at
$dir/$g\n";
+ echo 'allow '.$u->getUnixName().' to access at
'.$dir.'/'.$g."\n";
}
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=dc0b0b5de0b96acdb2a47aede40172718896143e
commit dc0b0b5de0b96acdb2a47aede40172718896143e
Author: Franck Villaume <[email protected]>
Date: Sat Jul 8 17:32:30 2017 +0200
use use_ftp vs. use_ftp_uploads
diff --git a/src/cronjobs/shell/homedirs.php b/src/cronjobs/shell/homedirs.php
index 595ec11..db60803 100755
--- a/src/cronjobs/shell/homedirs.php
+++ b/src/cronjobs/shell/homedirs.php
@@ -91,7 +91,7 @@ if (!is_dir($hpfx)) {
@mkdir($hpfx, 0755, true);
}
-if (forge_get_config('use_ftp_uploads')) {
+if (forge_get_config('use_ftp')) {
if (!($ftp_pfx = forge_get_config('ftp_upload_dir'))) {
// this should be set in the configuration
exit();
@@ -131,7 +131,7 @@ foreach(util_result_column_to_array($res,0) as $uname) {
/* create project/group homes */
$res = db_query_params('SELECT unix_group_name, group_name FROM groups WHERE
status=$1', array('A'));
-while ($row = pg_fetch_array($res)) {
+while ($row = db_fetch_array($res)) {
$groupname = $row['unix_group_name'] ;
if ($ftp_pfx && !is_dir($ftp_pfx . '/' . $groupname)) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3e3f2d28012dfe1ace54da808804a8aa1b885a86
commit 3e3f2d28012dfe1ace54da808804a8aa1b885a86
Author: Franck Villaume <[email protected]>
Date: Sat Jul 8 17:31:51 2017 +0200
remove deprecated var: use_ftp_uploads
diff --git a/src/etc/config.ini.d/defaults.ini
b/src/etc/config.ini.d/defaults.ini
index eaa32a8..3c1548c 100644
--- a/src/etc/config.ini.d/defaults.ini
+++ b/src/etc/config.ini.d/defaults.ini
@@ -59,7 +59,6 @@ use_forum = yes
use_frs = yes
fti_config = fusionforge
use_ftp = yes
-use_ftp_uploads = no
use_gateways = yes
use_mail = yes
use_manual_uploads = yes
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3a5ba11032d9e4359cc5a1a72c399dde83c453e1
commit 3a5ba11032d9e4359cc5a1a72c399dde83c453e1
Author: Franck Villaume <[email protected]>
Date: Sat Jul 8 17:31:19 2017 +0200
missing var + uses usesFTP function to enable ftp upload
diff --git a/src/common/frs/include/frs_utils.php
b/src/common/frs/include/frs_utils.php
index 69fd995..c08cca4 100644
--- a/src/common/frs/include/frs_utils.php
+++ b/src/common/frs/include/frs_utils.php
@@ -134,6 +134,7 @@ function frs_add_file_from_form($release, $type_id,
$processor_id, $release_date
$group_unix_name = $release->getFRSPackage()->getGroup()->getUnixName();
$incoming =
forge_get_config('groupdir_prefix').'/'.$group_unix_name.'/incoming';
+ $upload_dir = forge_get_config('ftp_upload_dir').'/'.$group_unix_name;
$filechecks = false;
@@ -157,7 +158,7 @@ function frs_add_file_from_form($release, $type_id,
$processor_id, $release_date
return _('Unknown file upload error.').' => ';
break;
}
- } elseif (forge_get_config('use_ftp_uploads') && $ftp_filename &&
util_is_valid_filename($ftp_filename) &&
is_file($upload_dir.'/'.$ftp_filename)) {
+ } elseif ($release->getFRSPackage()->getGroup()->usesFTP() &&
$ftp_filename && util_is_valid_filename($ftp_filename) &&
is_file($upload_dir.'/'.$ftp_filename)) {
$infile = $upload_dir.'/'.$ftp_filename;
$fname = $ftp_filename;
$move = false;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=78e0392ff9d8ba0e81501ea40cf80bedee7b12e6
commit 78e0392ff9d8ba0e81501ea40cf80bedee7b12e6
Author: Franck Villaume <[email protected]>
Date: Sat Jul 8 17:30:07 2017 +0200
add vsftpd package
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index c6c2bd1..38f9ee1 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -35,7 +35,8 @@ if [ -e /etc/debian_version ]; then
apache2 postgresql postgresql-contrib libnss-pgsql2 unscd \
cvs subversion viewvc python-pycurl git xinetd \
python-moinmoin libapache2-mod-wsgi python-psycopg2 \
- unoconv poppler-utils dpkg-dev
+ unoconv poppler-utils dpkg-dev \
+ vsftpd
if ! dpkg-vendor --is Ubuntu; then
apt-get install locales-all #
https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
fi
@@ -52,7 +53,8 @@ elif [ -e /etc/SuSE-release ]; then
subversion-server \
git git-web \
python-psycopg2 \
- mediawiki moinmoin-wiki
+ mediawiki moinmoin-wiki \
+ vsftpd
else
yum install -y make tar
backports_rpm
@@ -62,7 +64,8 @@ else
cvs subversion viewvc python-pycurl git gitweb xinetd \
moin mod_wsgi python-psycopg2 \
unoconv poppler-utils libreoffice-headless \
- mediawiki php-markdown
+ mediawiki php-markdown \
+ vsftpd
fi
(
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=091098c7bdcc6d63f87e6bf02aaf8cb2ad19f224
commit 091098c7bdcc6d63f87e6bf02aaf8cb2ad19f224
Author: Franck Villaume <[email protected]>
Date: Sat Jul 8 17:29:45 2017 +0200
add new rule for ftp support
diff --git a/src/GNUmakefile b/src/GNUmakefile
index 51f1b11..4dc42b1 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -143,6 +143,8 @@ install-lists: install-base-dirs
$(CP_R) cronjobs/lists $(DESTDIR)$(pkgdatadir)/cronjobs/
$(CP_R) post-install.d/lists $(DESTDIR)$(pkgdatadir)/post-install.d/
$(INSTALL) -d -m 00755 $(DESTDIR)$(pkgdatadir)/lists/
+install-ftp: install-base-dirs
+ $(CP_R) post-install.d/ftp $(DESTDIR)$(pkgdatadir)/post-install.d/
install-base: install-base-dirs install-common install-web install-db
install-scm
@@ -204,6 +206,8 @@ post-install-mta-exim4:
$(post_source_path)/post-install.d/mta-exim4/mta-exim4.sh configure
post-install-lists:
$(post_source_path)/post-install.d/lists/lists.sh configure
+post-install-ftp:
+ $(post_source_path)/post-install.d/ftp/ftp.sh configure
PLUGINS_INSTALLED:=$(shell [ -d "$(post_plugins_path)" ] && cd
$(post_plugins_path) && find * -maxdepth 0 -type d)
PLUGINS_POST_INSTALL_TARGETS=$(addprefix
post-install-plugin-,$(PLUGINS_INSTALLED))
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=177f9a097fcfe559e96359f2af7a127d9edc2441
commit 177f9a097fcfe559e96359f2af7a127d9edc2441
Author: Franck Villaume <[email protected]>
Date: Sat Jul 8 17:29:17 2017 +0200
vsftpd: enable chroot users
diff --git a/src/post-install.d/ftp/ftp.sh b/src/post-install.d/ftp/ftp.sh
index 3725a6b..fa6ab48 100755
--- a/src/post-install.d/ftp/ftp.sh
+++ b/src/post-install.d/ftp/ftp.sh
@@ -24,13 +24,15 @@ set -e
. $(forge_get_config source_path)/post-install.d/common/service.inc
configure_ftpd() {
- sed -i -e 's/^anonymous_enable=YES.*$/anonymous_enable=NO/'
/etc/vsftpd/vsftpd.conf
+ sed -i -e 's/^anonymous_enable=.*$/anonymous_enable=NO/'
/etc/vsftpd/vsftpd.conf
sed -i -e 's/^#ftpd_banner=.*$/ftpd_banner=Welcome to FusionForge FTP
server/' /etc/vsftpd/vsftpd.conf
+ sed -i -e 's/^chroot_local_user=.*$/chroot_local_user=YES/'
/etc/vsftpd/vsftpd.conf
}
remove_ftpd() {
sed -i -e 's/^anonymous_enable=NO.*$/anonymous_enable=YES/'
/etc/vsftpd/vsftpd.conf
sed -i -e 's/^ftpd_banner=Welcome.*$/#ftpd_banner=Welcome to blah FTP
service./' /etc/vsftpd/vsftpd.conf
+ sed -i -e 's/^chroot_local_user=YES.*$/chroot_local_user=NO/'
/etc/vsftpd/vsftpd.conf
}
restart_ftp_service()
-----------------------------------------------------------------------
Summary of changes:
autoinstall/install-src.sh | 9 ++++++---
src/GNUmakefile | 4 ++++
src/common/frs/include/frs_utils.php | 3 ++-
src/cronjobs/ftp/ftp_create_group_access.php | 26 ++++++++++++--------------
src/cronjobs/shell/homedirs.php | 4 ++--
src/etc/config.ini.d/defaults.ini | 1 -
src/post-install.d/ftp/ftp.sh | 4 +++-
7 files changed, 29 insertions(+), 22 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
