rpms/httpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix #707917 - add httpd-ssl-pass-dialog to ask for SSL password using systemd

Browse Source
This commit is contained in:
Jan Kaluza 2011-08-10 08:04:14 +02:00
parent badeb4a5ec
commit 2673a432a9
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
httpd-ssl-pass-dialog Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh
exec /bin/systemd-ask-password "Enter SSL pass phrase for $1 ($2) : "

12
httpd.spec
View File

@ -8,13 +8,14 @@
Summary: Apache HTTP Server Summary: Apache HTTP Server
Name: httpd Name: httpd
Version: 2.2.19 Version: 2.2.19
Release: 4%{?dist} Release: 5%{?dist}
URL: http://httpd.apache.org/ URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html Source1: index.html
Source3: httpd.logrotate Source3: httpd.logrotate
Source4: httpd.init Source4: httpd.init
Source5: httpd.sysconf Source5: httpd.sysconf
Source6: httpd-ssl-pass-dialog
Source10: httpd.conf Source10: httpd.conf
Source11: ssl.conf Source11: ssl.conf
Source12: welcome.conf Source12: welcome.conf
@ -320,6 +321,11 @@ mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
install -m755 $RPM_SOURCE_DIR/httpd.init \ install -m755 $RPM_SOURCE_DIR/httpd.init \
$RPM_BUILD_ROOT/etc/rc.d/init.d/httpd $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
# install http-ssl-pass-dialog
mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}
install -m755 $RPM_SOURCE_DIR/httpd-ssl-pass-dialog \
$RPM_BUILD_ROOT/%{_libexecdir}/httpd-ssl-pass-dialog
# install log rotation stuff # install log rotation stuff
mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \ install -m 644 -p $RPM_SOURCE_DIR/httpd.logrotate \
@ -501,6 +507,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.dir %attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.dir
%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.pag %attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.pag
%attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.sem %attr(0600,apache,root) %ghost %{_localstatedir}/cache/mod_ssl/scache.sem
%{_libexecdir}/httpd-ssl-pass-dialog
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
@ -512,6 +519,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh %{_libdir}/httpd/build/*.sh
%changelog %changelog
* Wed Aug 10 2011 Jan Kaluza <jkaluza@redhat.com> - 2.2.19-5
- fix #707917 - add httpd-ssl-pass-dialog to ask for SSL password using systemd
* Fri Jul 22 2011 Iain Arnell <iarnell@gmail.com> 1:2.2.19-4 * Fri Jul 22 2011 Iain Arnell <iarnell@gmail.com> 1:2.2.19-4
- rebuild while rpm-4.9.1 is untagged to remove trailing slash in provided - rebuild while rpm-4.9.1 is untagged to remove trailing slash in provided
directory names directory names

2
ssl.conf
View File

@ -28,7 +28,7 @@ Listen 443
# Configure the pass phrase gathering process. # Configure the pass phrase gathering process.
# The filtering dialog program (`builtin' is a internal # The filtering dialog program (`builtin' is a internal
# terminal dialog) has to provide the pass phrase on stdout. # terminal dialog) has to provide the pass phrase on stdout.
SSLPassPhraseDialog builtin SSLPassPhraseDialog exec:/usr/libexec/httpd-ssl-pass-dialog
# Inter-Process Session Cache: # Inter-Process Session Cache:
# Configure the SSL Session Cache: First the mechanism # Configure the SSL Session Cache: First the mechanism