[pkg-remote-commits] [xrdp] 03/03: Use ssl-cert.

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit e82f597fdcaaed7ef378aed12f62d0e12c46c2f0
Author: Dominik George <nik at naturalnet.de>
Date:   Sun Jan 1 12:27:22 2017 +0100

    Use ssl-cert.
---
 debian/control       | 2 +-
 debian/xrdp.postinst | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index a67a636..7f55d81 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Architecture: any
 Depends:
  adduser,
  lsb-base (>= 3.0-6),
- openssl,
+ ssl-cert,
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
diff --git a/debian/xrdp.postinst b/debian/xrdp.postinst
index b38c876..271fd98 100644
--- a/debian/xrdp.postinst
+++ b/debian/xrdp.postinst
@@ -45,12 +45,11 @@ configure)
 		chown xrdp /etc/xrdp/rsakeys.ini
 	)
 
-	# Generate snakeoil X509 certificate and key
+	# Generate/link snakeoil X509 certificate and key
 	test -e /etc/xrdp/cert.pem || (
-		umask 077
-		cd /etc/xrdp
-		openssl req -x509 -newkey rsa:2048 -nodes -keyout key.pem -out cert.pem -days 365
-		chown xrdp cert.pem key.pem
+		make-ssl-cert generate-default-snakeoil
+		ln -s /etc/ssl/certs/ssl-cert-snakeoil.pem /etc/xrdp/cert.pem
+		ln -s /etc/ssl/private/ssl-cert-snakeoil.key /etc/xrdp/key.pem
 	)
 
 	;;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/xrdp.git