[Git][debian-proftpd-team/proftpd][master] 2 commits: Added some docs by upstreams and cleaned up rules

[Francesco Paolo Lovergine]

Francesco Paolo Lovergine pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
230c3eb8 by Francesco Paolo Lovergine at 2020-12-15T17:46:33+01:00
Added some docs by upstreams and cleaned up rules

- - - - -
511a82c8 by Francesco Paolo Lovergine at 2020-12-18T10:36:02+01:00
Added sftp configuration template

- - - - -


5 changed files:

- debian/changelog
- + debian/proftpd-core.docs
- debian/rules
- − debian/scripts/dpkg-arch.mk
- + debian/templates/sftp.conf


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+proftpd-dfsg (1.3.7a+dfsg-4) UNRELEASED; urgency=medium
+
+  * Added a proftpd-core.docs to include a few secondary but sometimes useful
+    contributed docs from upstream.
+  * Now using standard makefile for archs as provided by dpkg-dev.
+  * Added a sftp.conf template for optional SFTP support.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Dec 2020 12:54:39 +0100
+
 proftpd-dfsg (1.3.7a+dfsg-3) unstable; urgency=medium
 
   * Introduced a new (old) -core package and made -basic a transitional


=====================================
debian/proftpd-core.docs
=====================================
@@ -0,0 +1,7 @@
+contrib/dist/systemd
+CREDITS
+NEWS
+README.LDAP
+README.modules
+RELEASE_NOTES
+sample-configurations


=====================================
debian/rules
=====================================
@@ -22,10 +22,7 @@ ifeq (,$(filter test,$(LOCAL_BUILD_OPTIONS)))
 override_dh_auto_test:
 endif
 
-# dpkg-arch rules
-ifeq (,$(DEB_BUILD_GNU_TYPE))
-  include debian/scripts/dpkg-arch.mk
-endif
+include /usr/share/dpkg/architecture.mk
 
 # XAttr does not exist on KFreeBSD
 #


=====================================
debian/scripts/dpkg-arch.mk deleted
=====================================
@@ -1,7 +0,0 @@
-# see dpkg-architecture(8)
-DEB_BUILD_ARCH		:= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_GNU_CPU	:= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_GNU_SYSTEM	:= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-DEB_BUILD_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_SYSTEM	:= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-DEB_HOST_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)


=====================================
debian/templates/sftp.conf
=====================================
@@ -0,0 +1,42 @@
+#
+# Proftpd sample configuration for SFTP connections.
+#
+# Once enabled, you can even disable the sftpserver support of OpenSSH on port 22.
+# To do that, comment out the Subsystem sftp /usr/lib/openssh/sftp-server
+# line in /etc/ssh/sshd_config and restart the service.
+#
+
+<IfModule mod_sftp.c>
+#SFTPEngine     on
+#Port           2222
+#SFTPLog        /var/log/proftpd/sftp.log
+#
+# Configure all host keys, using the same host key
+# files that OpenSSH uses.
+#
+#SFTPHostKey /etc/ssh/ssh_host_rsa_key
+#SFTPHostKey /etc/ssh/ssh_host_dsa_key
+#SFTPHostKey /etc/ssh/ssh_host_rsa_key
+#SFTPHostKey /etc/ssh/ssh_host_ecdsa_key
+#SFTPHostKey /etc/ssh/ssh_host_ed25519_key
+#
+# Preferred authentication method is by keys
+#
+#SFTPAuthMethods publickey
+#
+# This is available only if mod_sftp_pam is used
+# 
+#SFTPAuthMethods keyboard-interactive
+#
+# Use either
+#    ssh-keygen -e -f ~user/.ssh/id_rsa.pub >/etc/proftpd/authorized_keys/user
+# or
+#    ssh-keygen -e -f ~user/.ssh/authorized_keys >/etc/proftpd/authorized_keys/user
+# to convert users public keys in RFC4716 format.
+#
+#SFTPAuthorizedUserKeys file:/etc/proftpd/authorized_keys/%u
+#
+# Enable compression
+#
+#SFTPCompression delayed
+</IfModule>



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/b5db06e17f78a961b4bd46250df6ea9009aeb48c...511a82c8bfceff04dc8582fc0c1088bd0ae2e436

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/b5db06e17f78a961b4bd46250df6ea9009aeb48c...511a82c8bfceff04dc8582fc0c1088bd0ae2e436
You're receiving this email because of your account on salsa.debian.org.