From dc5c65a5f48ffae9ad37b88b275eb59f80785164 Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 4 Nov 2007 18:52:27 +0000 Subject: [PATCH] Fixed makegraphs. Made the vsftpd final. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1059 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/pam/ftp | 2 + config/pam/other | 5 ++ config/rootfiles/common/pam | 2 + config/rootfiles/packages/vsftpd | 3 +- config/vsftpd/vsftpd.conf | 108 ++++++++----------------------- config/vsftpd/vsftpd.user_list | 0 doc/packages-list.txt | 5 ++ lfs/vsftpd | 2 +- src/scripts/makegraphs | 2 +- 9 files changed, 44 insertions(+), 85 deletions(-) create mode 100644 config/pam/ftp create mode 100644 config/pam/other create mode 100644 config/vsftpd/vsftpd.user_list diff --git a/config/pam/ftp b/config/pam/ftp new file mode 100644 index 0000000000..3475b48220 --- /dev/null +++ b/config/pam/ftp @@ -0,0 +1,2 @@ +auth required pam_unix.so nullok shadow +account required pam_unix.so diff --git a/config/pam/other b/config/pam/other new file mode 100644 index 0000000000..c286c823c3 --- /dev/null +++ b/config/pam/other @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth required pam_deny.so +account required pam_deny.so +password required pam_deny.so +session required pam_deny.so diff --git a/config/rootfiles/common/pam b/config/rootfiles/common/pam index bc667fd4c8..3472453fcb 100644 --- a/config/rootfiles/common/pam +++ b/config/rootfiles/common/pam @@ -1,5 +1,7 @@ etc/pam.d +#etc/pam.d/ftp #etc/pam.d/imap +#etc/pam.d/other #etc/pam.d/pop #etc/pam.d/sieve #etc/pam.d/smtp diff --git a/config/rootfiles/packages/vsftpd b/config/rootfiles/packages/vsftpd index 39b3f3a1cf..e9886dc4cc 100644 --- a/config/rootfiles/packages/vsftpd +++ b/config/rootfiles/packages/vsftpd @@ -1,8 +1,9 @@ etc/rc.d/init.d/vsftpd etc/vsftpd.conf +etc/vsftpd.user_list home/ftp usr/sbin/vsftpd #usr/share/man/man5/vsftpd.conf.5 #usr/share/man/man8/vsftpd.8 -#var/ftp +var/ftp var/ftp/empty diff --git a/config/vsftpd/vsftpd.conf b/config/vsftpd/vsftpd.conf index 984e28fa3a..984a30fbb7 100644 --- a/config/vsftpd/vsftpd.conf +++ b/config/vsftpd/vsftpd.conf @@ -1,106 +1,50 @@ -# Example config file /etc/vsftpd.conf -# -# The default compiled in settings are fairly paranoid. This sample file -# loosens things up a bit, to make the ftp daemon more usable. -# Please see vsftpd.conf.5 for all compiled in defaults. -# -# READ THIS: This example file is NOT an exhaustive list of vsftpd options. -# Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's -# capabilities. -# -# Allow anonymous FTP? (Beware - allowed by default if you comment this out). -anonymous_enable=YES +# Default config for vsftpd on ipfire +background=YES +listen=YES # -# Uncomment this to allow local users to log in. -#local_enable=YES +nopriv_user=vsftpd # -# Uncomment this to enable any form of FTP write command. -#write_enable=YES +local_enable=YES +write_enable=YES # -# Default umask for local users is 077. You may wish to change this to 022, -# if your users expect that (022 is used by most other ftpd's) -#local_umask=022 +local_umask=022 # -# Uncomment this to allow the anonymous FTP user to upload files. This only -# has an effect if the above global write enable is activated. Also, you will -# obviously need to create a directory writable by the FTP user. +#anonymous_enable=YES #anon_upload_enable=YES -# -# Uncomment this if you want the anonymous FTP user to be able to create -# new directories. #anon_mkdir_write_enable=YES # -# Activate directory messages - messages given to remote users when they -# go into a certain directory. dirmessage_enable=YES # -# Activate logging of uploads/downloads. xferlog_enable=YES +xferlog_file=/var/log/vsftpd.log +xferlog_std_format=YES # -# Make sure PORT transfer connections originate from port 20 (ftp-data). connect_from_port_20=YES # -# If you want, you can arrange for uploaded anonymous files to be owned by -# a different user. Note! Using "root" for uploaded files is not -# recommended! #chown_uploads=YES #chown_username=whoever # -# You may override where the log file goes if you like. The default is shown -# below. -#xferlog_file=/var/log/vsftpd.log -# -# If you want, you can have your log file in standard ftpd xferlog format -#xferlog_std_format=YES -# -# You may change the default value for timing out an idle session. -#idle_session_timeout=600 -# -# You may change the default value for timing out a data connection. -#data_connection_timeout=120 +idle_session_timeout=600 +data_connection_timeout=120 # -# It is recommended that you define on your system a unique user which the -# ftp server can use as a totally isolated and unprivileged user. -#nopriv_user=ftpsecure -# -# Enable this and the server will recognise asynchronous ABOR requests. Not -# recommended for security (the code is non-trivial). Not enabling it, -# however, may confuse older FTP clients. #async_abor_enable=YES -# -# By default the server will pretend to allow ASCII mode but in fact ignore -# the request. Turn on the below options to have the server actually do ASCII -# mangling on files when in ASCII mode. -# Beware that on some FTP servers, ASCII support allows a denial of service -# attack (DoS) via the command "SIZE /big/file" in ASCII mode. vsftpd -# predicted this attack and has always been safe, reporting the size of the -# raw file. -# ASCII mangling is a horrible feature of the protocol. #ascii_upload_enable=YES #ascii_download_enable=YES # -# You may fully customise the login banner string: -#ftpd_banner=Welcome to blah FTP service. -# -# You may specify a file of disallowed anonymous e-mail addresses. Apparently -# useful for combatting certain DoS attacks. -#deny_email_enable=YES -# (default follows) -#banned_email_file=/etc/vsftpd.banned_emails +ftpd_banner=Welcome to IPFire FTP service. # -# You may specify an explicit list of local users to chroot() to their home -# directory. If chroot_local_user is YES, then this list becomes a list of -# users to NOT chroot(). +chroot_local_user=YES #chroot_list_enable=YES -# (default follows) -#chroot_list_file=/etc/vsftpd.chroot_list -# -# You may activate the "-R" option to the builtin ls. This is disabled by -# default to avoid remote users being able to cause excessive I/O on large -# sites. However, some broken FTP clients such as "ncftp" and "mirror" assume -# the presence of the "-R" option, so there is a strong case for enabling it. -#ls_recurse_enable=YES -background=YES -listen=YES -nopriv_user=vsftpd secure_chroot_dir=/var/ftp/empty +# +ls_recurse_enable=YES +# +#ssl_enable=YES +#force_local_data_ssl=NO +#force_local_logins_ssl=NO +#rsa_cert_file=/etc/vsftpd.pem +# +userlist_deny=NO +userlist_enable=YES +userlist_file=/etc/vsftpd.user_list +# diff --git a/config/vsftpd/vsftpd.user_list b/config/vsftpd/vsftpd.user_list new file mode 100644 index 0000000000..e69de29bb2 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index aa96449eae..c65083ad71 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -103,6 +103,8 @@ * httpd-2.2.6 * hwdata * iana-etc-2.10 +* icecast-2.3.1 +* icegenerator-0.5.5-pre2 * inetutils-1.4.2 * ipac-ng-1.31 * ipaddr-1.2 @@ -166,6 +168,7 @@ * module-init-tools-3.2.2 * mpc-0.12.1 * mpd-0.13.0 +* mpeg2dec-0.4.0b * mpfire-ipfire * mpg123-0.59r * mtd-CVS-20070507 @@ -245,11 +248,13 @@ * util-linux-2.12r * vim-7.0 * vlan.1.9 +* vlc-0.8.6c * vsftpd-2.0.5 * wget-1.10.2 * whatmask-1.2 * which-2.16 * wireless_tools.28 * xmbmon205 +* xvidcore-1.1.0 * zaptel-1.4.4 * zlib-1.2.3 diff --git a/lfs/vsftpd b/lfs/vsftpd index 1cce1dfa29..4da8711a9a 100644 --- a/lfs/vsftpd +++ b/lfs/vsftpd @@ -78,7 +78,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && echo "#define VSF_BUILD_SSL" >>builddefs.h - cd $(DIR_APP) && echo "#undef VSF_BUILD_PAM" >>builddefs.h cd $(DIR_APP) && install -v -d -m 0755 /var/ftp/empty cd $(DIR_APP) && install -v -d -m 0755 /home/ftp chown vsftpd.vsftpd /home/ftp @@ -87,5 +86,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && install -v -m 644 vsftpd.8 /usr/share/man/man8 cd $(DIR_APP) && install -v -m 644 vsftpd.conf.5 /usr/share/man/man5 cd $(DIR_APP) && install -v -m 644 $(DIR_SRC)/config/vsftpd/vsftpd.conf /etc + cd $(DIR_APP) && install -v -m 644 $(DIR_SRC)/config/vsftpd/vsftpd.user_list /etc @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs index 056d768d85..c4bfe70f8b 100644 --- a/src/scripts/makegraphs +++ b/src/scripts/makegraphs @@ -52,7 +52,7 @@ if((${Lang::language} eq 'el') || (${Lang::language} eq 'zt')) { eval `/bin/cat "${General::swroot}/langs/en.pl"`; } else { - use translated version for other languages + #use translated version for other languages %tr=%Lang::tr; } -- 2.39.2