diff options
| author | root <root@rshg054.dnsready.net> | 2012-08-21 00:02:33 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-08-21 00:02:33 +0000 |
| commit | a3669c04838b48b6891b2ffc4b296fa515f8174f (patch) | |
| tree | fb838dbf7e59e2f79d7fca0fce6d93c254a5c173 /extra/proftpd | |
| parent | 524da814660fa35bca4a24d0faa0a10b7eab5c6f (diff) | |
Tue Aug 21 00:02:33 UTC 2012
Diffstat (limited to 'extra/proftpd')
| -rw-r--r-- | extra/proftpd/PKGBUILD | 22 | ||||
| -rwxr-xr-x | extra/proftpd/proftpd | 4 | ||||
| -rw-r--r-- | extra/proftpd/proftpd.service | 14 |
3 files changed, 28 insertions, 12 deletions
diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD index 78759e944..47be71491 100644 --- a/extra/proftpd/PKGBUILD +++ b/extra/proftpd/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 164987 2012-08-07 20:14:43Z eric $ +# $Id: PKGBUILD 165441 2012-08-19 15:31:22Z andrea $ # Maintainer: # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=proftpd pkgver=1.3.4b -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A high-performance, scalable FTP server" arch=('i686' 'x86_64') url="http://www.proftpd.org" license=('GPL') -depends=('libldap' 'libmysqlclient' 'postgresql-libs') +depends=('libmysqlclient' 'postgresql-libs') backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc} - 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') + 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service') md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2' 'e5b9bd78029a15f82994efcb7ed2e9fb' - '8177292919acb2f087ded0bb7b2dcc32' + 'c439a0a1dbc21b604d8382da87aa021b' 'ddb09eb13131becdf0e081eef413116b' - '71d5932b0461c318ed68c2c0c2660736') + '71d5932b0461c318ed68c2c0c2660736' + '2c446f531948c8cc0a1e0fae28f8dfda') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,12 +29,13 @@ build() { --disable-pam \ --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ --sysconfdir=/etc \ - --localstatedir=/var/run \ + --localstatedir=/run/proftpd \ --enable-ctrls \ --enable-ipv6 \ --with-includes=/usr/include/mysql:/usr/include/postgresql \ --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ - --enable-nls + --enable-nls \ + --with-systemd make } @@ -49,6 +51,6 @@ package() { install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" - # /var/run is a symlink to /run now - rm -rf "${pkgdir}/var" + install -d "${pkgdir}/usr/lib/systemd/system/" + install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/" } diff --git a/extra/proftpd/proftpd b/extra/proftpd/proftpd index df9283a77..9ea1d47fc 100755 --- a/extra/proftpd/proftpd +++ b/extra/proftpd/proftpd @@ -20,11 +20,11 @@ case "$1" in ;; stop) stat_busy "Stopping ProFTPd Server" - [ -f /run/proftpd.pid ] && kill $(cat /run/proftpd.pid) &> /dev/null + [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm -f /run/proftpd.pid + rm -f /run/proftpd/proftpd.pid rm_daemon proftpd stat_done fi diff --git a/extra/proftpd/proftpd.service b/extra/proftpd/proftpd.service new file mode 100644 index 000000000..c202a2fdf --- /dev/null +++ b/extra/proftpd/proftpd.service @@ -0,0 +1,14 @@ +[Unit] +Description = ProFTPD FTP Server +After = network.target nss-lookup.target local-fs.target remote-fs.target + +[Service] +Type = forking +PIDFile = /run/proftpd/proftpd.pid +Environment = PROFTPD_ARGS= +EnvironmentFile = -/etc/conf.d/proftpd +ExecStart = /usr/sbin/proftpd $PROFTPD_ARGS +ExecReload = /bin/kill -HUP $MAINPID + +[Install] +WantedBy = multi-user.target |