diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2017-05-09 16:30:05 +0300 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2017-05-09 16:30:05 +0300 |
| commit | 3f390c55097e6d447c9c788d8b836519127fc1de (patch) | |
| tree | dc12cbcbf1dff4d5421e046550a8ea1d3148247d | |
| parent | c29c5d498ec02b917ca266929442bd0ddac3f2b1 (diff) | |
vsftpd: create directory for extra config files
* create /etc/vsftpd directory for extra config files
like userlist, certificate and key
* modify config file to use that directory
* include that directory in conffiles for backup
* use PKG_HASH
* update URL
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
| -rw-r--r-- | net/vsftpd/Makefile | 10 | ||||
| -rw-r--r-- | net/vsftpd/files/vsftpd.conf | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/net/vsftpd/Makefile b/net/vsftpd/Makefile index fa504d1b4..fdd045e29 100644 --- a/net/vsftpd/Makefile +++ b/net/vsftpd/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vsftpd PKG_VERSION:=3.0.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://security.appspot.com/downloads/ -PKG_MD5SUM:=da119d084bd3f98664636ea05b5bb398 +PKG_HASH:=9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7 PKG_LICENSE:=GPLv2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) @@ -24,8 +24,8 @@ define Package/vsftpd/Default SUBMENU:=File Transfer SECTION:=net CATEGORY:=Network - TITLE:=A fast and secure FTP server - URL:=http://vsftpd.beasts.org/ + TITLE:=Fast and secure FTP server + URL:=https://security.appspot.com/vsftpd.html MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl> endef @@ -45,6 +45,7 @@ endef define Package/vsftpd/conffiles /etc/vsftpd.conf +/etc/vsftpd endef Package/vsftpd-tls/conffiles=$(Package/vsftpd/conffiles) @@ -88,6 +89,7 @@ define Package/vsftpd/install $(INSTALL_CONF) ./files/$(PKG_NAME).conf $(1)/etc/$(PKG_NAME).conf $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) + $(INSTALL_DIR) $(1)/etc/vsftpd endef Package/vsftpd-tls/install=$(Package/vsftpd/install) diff --git a/net/vsftpd/files/vsftpd.conf b/net/vsftpd/files/vsftpd.conf index 7d46506e9..e06ac3543 100644 --- a/net/vsftpd/files/vsftpd.conf +++ b/net/vsftpd/files/vsftpd.conf @@ -11,13 +11,13 @@ session_support=NO #syslog_enable=YES #userlist_enable=YES #userlist_deny=NO -#userlist_file=/etc/vsftpd.users +#userlist_file=/etc/vsftpd/vsftpd.users #xferlog_enable=YES #xferlog_file=/var/log/vsftpd.log #xferlog_std_format=YES ### ### TLS/SSL options -### example key generation: openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/config/vsftpd_privkey.pem -out /etc/config/vsftpd_cert.pem -subj /C="DE"/ST="Saxony"/L="Leipzig"/CN="OpenWrt" +### example key generation: openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/vsftpd/vsftpd_privkey.pem -out /etc/vsftpd/vsftpd_cert.pem -subj /C="DE"/ST="Saxony"/L="Leipzig"/CN="OpenWrt" #ssl_enable=YES #allow_anon_ssl=NO #force_local_data_ssl=NO @@ -25,6 +25,6 @@ session_support=NO #ssl_tlsv1=YES #ssl_sslv2=NO #ssl_sslv3=NO -#rsa_cert_file=/etc/config/vsftpd_cert.pem -#rsa_private_key_file=/etc/config/vsftpd_privkey.pem +#rsa_cert_file=/etc/vsftpd/vsftpd_cert.pem +#rsa_private_key_file=/etc/vsftpd/vsftpd_privkey.pem |