Added certificate generation at install time

5 files changed, 36 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 197a4fbd9da4..af774b639781 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = pure-ftpd
 	pkgdesc = A secure, production-quality and standard-conformant FTP server, focused on efficiency and ease of use.
 	pkgver = 1.0.42
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.pureftpd.org/
+	install = pure-ftpd.install
 	arch = i686
 	arch = x86_64
 	license = custom
@@ -14,14 +15,12 @@ pkgbase = pure-ftpd
 	source = pure-ftpd.service
 	source = pure-ftpd.logrotate
 	source = welcome.msg
-	source = pure-ftpd.pem
-	source = pure-ftpd-dhparams.pem
+	source = pure-ftpd.install
 	md5sums = 4022f38939f6a112b18c1a43dee552c1
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
-	md5sums = SKIP
 
 pkgname = pure-ftpd
 
diff --git a/PKGBUILD b/PKGBUILD
index dedee6df9c5d..0e3f8c863c2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: mrxx <mrxx at cyberhome dot at>
+# Contributor: kleph
 # Contributor: fila pruda.com
 # Contributor: tuxce <tuxce.net@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -7,7 +8,7 @@
 
 pkgname=pure-ftpd
 pkgver=1.0.42
-pkgrel=1
+pkgrel=2
 pkgdesc="A secure, production-quality and standard-conformant FTP server, focused on efficiency and ease of use."
 arch=('i686' 'x86_64')
 url="http://www.pureftpd.org/"
@@ -15,18 +16,17 @@ license=('custom')
 depends=('openssl' 'libmariadbclient')
 conflicts=('pure-ftpd-db')
 backup=('etc/pure-ftpd/pure-ftpd.conf')
+install=pure-ftpd.install
 source=("http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-${pkgver}.tar.bz2"
 	'pure-ftpd.service'
 	'pure-ftpd.logrotate'
 	'welcome.msg'
-	'pure-ftpd.pem'
-	'pure-ftpd-dhparams.pem' )
+	'pure-ftpd.install' )
 
 md5sums=('4022f38939f6a112b18c1a43dee552c1'
 	'SKIP'
 	'SKIP'
 	'SKIP'
-	'SKIP'
 	'SKIP')
 
 build() {
@@ -54,7 +54,6 @@ package() {
 	install -Dm755 configuration-file/pure-config.pl ${pkgdir}/usr/bin/pure-config.pl
 	install -Dm644 -t ${pkgdir}/usr/lib/systemd/system/ ${srcdir}/pure-ftpd.service
 	install -Dm644 ${srcdir}/pure-ftpd.logrotate ${pkgdir}/etc/logrotate.d/pure-ftpd
-	install -Dm640 -t ${pkgdir}/etc/ssl/private/ ${srcdir}/pure-ftpd.pem ${srcdir}/pure-ftpd-dhparams.pem
 	install -Dm644 -t ${pkgdir}/usr/share/doc/${pkgname}/ README* pureftpd-*sql.conf
 	install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 
diff --git a/pure-ftpd-dhparams.pem b/pure-ftpd-dhparams.pem
deleted file mode 100644
index b5c28d6071c9..000000000000
--- a/pure-ftpd-dhparams.pem
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN DH PARAMETERS-----
-MIIBCAKCAQEAgYXAOGI06s/DuJu1ptZo0AQ1L1paOmHe3JZVIsWx+ppfkeFmPeeR
-0DDFHrO05sF/cC7BRiwYwOK4AWXgNAj/71BCdZAk1ENrh1CrMRzyl3pRRX2FCn0+
-++CTYq2puBEVXoldQFTXuuRvA8VPwWjLK6hp08IedbZpV79XymQ/c9hbj2UZ4wq1
-lVXkb1wDHcOXLNruljbw1bVPrE8R57QLi7EXV7Bv99k7N2YtclmLlDL8hvDKa19P
-EVkMsrAh+9LjHYnRSFbN+Ljl5YUBODd+B+6qPHI3Gj54qCIrOdkjI8pkhKAJPrkw
-cw37IpYgZmiE+3FdEDcIRWEzcmlTwjW7mwIBAg==
------END DH PARAMETERS-----
diff --git a/pure-ftpd.install b/pure-ftpd.install
new file mode 100644
index 000000000000..54d3238a0256
--- /dev/null
+++ b/pure-ftpd.install
@@ -0,0 +1,29 @@
+post_install()
+{
+	if [ ! -f /etc/ssl/private/pure-ftpd-dhparams.pem ]; then
+		echo 
+		openssl dhparam -out /etc/ssl/private/pure-ftpd-dhparams.pem 2048
+		chmod 600 /etc/ssl/private/pure-ftpd-dhparams.pem
+	fi
+
+	if [ ! -f /etc/ssl/private/pure-ftpd.pem ]; then
+		echo
+		openssl req -x509 -nodes -newkey rsa:2048 -sha256 -keyout /etc/ssl/private/pure-ftpd.pem -out /etc/ssl/private/pure-ftpd.pem -days 3650 -subj "/C=US/ST=California/L=San Francisco/O=FD/CN=$(hostname -f)"
+		echo
+		echo "A self-signed TLS certificate has been generated for you."
+		echo
+		echo "You can generate a new one with the following commands (as root):"
+		echo "openssl req -x509 -nodes -newkey rsa:2048 -sha256 -keyout /etc/ssl/private/pure-ftpd.pem -out /etc/ssl/private/pure-ftpd.pem -days 365"
+		echo "chmod 600 /etc/ssl/private/pure-ftpd.pem"
+		echo
+		echo "Note: The Common Name (CN) should be exactly the FQDN of the server."
+		echo "The validity can be extended by increasing the '-days' parameter value."
+		echo
+		echo "Then restart the ftp service: systemctl restart pure-ftpd.service"
+		echo
+	fi
+}
+
+post_upgrade() {
+    post_install
+}
diff --git a/pure-ftpd.pem b/pure-ftpd.pem
deleted file mode 100644
index a88f447cb7fb..000000000000
--- a/pure-ftpd.pem
+++ /dev/null
@@ -1,49 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC1E8Hvk4nVtTUX
-i5aUMc7vtIyVd8NdGcP9Yi/9rSBlL/WZgpdzfdIrJ13wXYNtVT0tcTKPc6usMaUf
-1RloyVllYmF1rB6OpkX/cAujnuOJHOR02NCNT//h/xOG25rjBOI+eKvJURnFNGtl
-q/vE7fvLZPTycSnnj7JCazqbxaQyFercWMx9cGNEvbpHpzaEGLwDOgLi1r4ehAuU
-FVq++Uuz/QkFEt7jEFZE0zr+6rxxpeUvpLUZgjWY1rveoUpyiXS48+++4OKlicuZ
-QOx/MONcir+YXPwnmh5qZBDfh/IU08tXP0WEubkpDyQ5YTpAECphGgMq02pxRpJM
-Ry6MyRJ9AgMBAAECggEARCjsvl6d6pisJHHBu4TILUicBoMvQbM6J/22rNlnMU+N
-NjyG/80juGS4IotAtn34akuKyZ6zxzxkuIfBacUo5lXS87VXR0DlZlJpvyxG38zF
-Xgpi7l5npk0ar4+oTL4A350SpNPnTGj/6CSFv8oJFrWo0j2wlV5srj2osQwDU2pz
-mfE1KxbQlB0yNh2WTy5vCzl1bmQwaWzn6/urvpChInJ11/zsEmDaNXWgtRr55n78
-+tO0p5Sn0o4l0nYezPGt21jkLasGwQHzYzUuq2rw1MzGPAOgx+8AmWahnKDSqzSW
-Wyb4CF3Sq/q0Phxbt7fdb7tioJ7R72jkQQz5uhEVLQKBgQDvnrnT0pIbTSFw+V7A
-Y2/T8n8xtENqF5Yq2tecvmmn22MSuxYT0uVAEH7jPKWU3AxXcoNIp7//bo6cNNGd
-3NgAH9TAVJX1KUapgCv/7c4AAGGMDHqTg/n9LYRyH2Q+mY2QEsojMdblCeWCe854
-u2c4MFsd4kRt/RDF60si4CsBxwKBgQDBdIzvLe9a+rc2WnqEgK88AFQIVt/3pB9q
-eWymnpWO6gIt4u6WABrZs3Gi73zcRUz5UrwAFKOYFYb5xOWWqBkDeU6tVs/rhhJq
-53YkDLR2VnfErS/Y1XBzVu3DrlZ0MINOmmuoWCjFmG3RwjdSjUmzYVWiTBpb9GoP
-+lGOwtkJmwKBgQCGxuKC0Ee573JF1x2CXOvDbPw5+siIXefrBtiLo1ZOQcnB+VT7
-pX2owR59tdj0l6ihbxmEvkXx6D9ygQr+Hf+oYj8KRwlpseO65wrYkutxeMVlPoeb
-fXoY+4cpoZqC01+aj9b+YMQcY6qh7/08TzxJkHlPn7sZmmPazvOeFDRcdQKBgBL6
-+nDlEtzcSGl+yxKBBbBfX99JlsPXSHXL4Asg+A+Dih8yarIw5HGDl5yi3p9F9V1o
-7qUbYUmkow+Sb+wuJfYfSsbbA59aEiiG+SJkVLhfl3SmgVFG77eBSeavDjBsKhXm
-NLXZoHZylCPGaGMjFZ4R6LL5wIRRIK7com/dUioNAoGAGZynZkZGmDY97CCKmxhR
-KFAfNjWEXYFkbmbVLfrl9oBWSok7eVHq0ijQDAXAz7LN3Sr9wiUBIiMDdcOEoEUt
-zYIjWt2RQqxpcl7zHjPcw6/sLnjPpRSGnhidE5dkUDNz6ZcZqH7vkB6+XymXpCHe
-kuaUZL4/IxaM731EiA4y7Ug=
------END PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIDYTCCAkmgAwIBAgIJAJFVJp1wlOXuMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNp
-c2NvMQswCQYDVQQKDAJGRDAeFw0xNTA3MTIxMzE5NThaFw0zMTA3MDgxMzE5NTha
-MEcxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1T
-YW4gRnJhbmNpc2NvMQswCQYDVQQKDAJGRDCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBALUTwe+TidW1NReLlpQxzu+0jJV3w10Zw/1iL/2tIGUv9ZmCl3N9
-0isnXfBdg21VPS1xMo9zq6wxpR/VGWjJWWViYXWsHo6mRf9wC6Oe44kc5HTY0I1P
-/+H/E4bbmuME4j54q8lRGcU0a2Wr+8Tt+8tk9PJxKeePskJrOpvFpDIV6txYzH1w
-Y0S9ukenNoQYvAM6AuLWvh6EC5QVWr75S7P9CQUS3uMQVkTTOv7qvHGl5S+ktRmC
-NZjWu96hSnKJdLjz777g4qWJy5lA7H8w41yKv5hc/CeaHmpkEN+H8hTTy1c/RYS5
-uSkPJDlhOkAQKmEaAyrTanFGkkxHLozJEn0CAwEAAaNQME4wHQYDVR0OBBYEFClz
-KzGT/dm1fkGrTDAo/ojJYN2BMB8GA1UdIwQYMBaAFClzKzGT/dm1fkGrTDAo/ojJ
-YN2BMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBACPCs85JvGRbZZkL
-8Y0CVy6rekO9FjUR3jRUqtgmZLmjxzPvvPlOoizK8qA3cAeWD7U9kNAuwr/huf/k
-zcsk69HGhLUBsr9SB+kv8o52CqDAL2ueP25Wv+vfhqhWe6eLC078dqm/Us3/DFc2
-v9aDD88Yg7HrkrV/qiCT1zJUxEzkTKAVNfl1/kt44ZKVFJZ8M7DW+qR2d1RS3skB
-tjAluFnks0liNI73e6yyHOylceZcVaM0g9Ly2wE4Ig9AfPxzeqSe2z792UYCOtVO
-+0DzZFKVEzx+LDhxZClm3nRtxb8YJY4fm2ux6skoAYX1AkXov2PAbfbth5hwFrO1
-PtYC7Wc=
------END CERTIFICATE-----