Browse files

+backuppc-3.1.0-r2.ebuild, files/httpd.conf:

Updated the SSL certificate/key paths in httpd.conf to point to /etc/ssl/apache2
  • Loading branch information...
1 parent b4a000b commit faabe3174b519bda97342fcc51d51415f7152f5a @lnagel committed Feb 27, 2010
View
12 app-backup/backuppc/ChangeLog
@@ -1,7 +1,7 @@
-*backuppc-3.1.0 (29 Sep 2009)
+*backuppc-3.1.0-r2 (27 Feb 2010)
+
+ 27 Feb 2010; <lenno@gentoo.org> -backuppc-3.1.0-r1.ebuild,
+ +backuppc-3.1.0-r2.ebuild, files/httpd.conf:
+ Updated the SSL certificate/key paths in httpd.conf to point to
+ /etc/ssl/apache2
-29 Sep 2009; Lenno Nagel <lenno@nagel.ee> +backuppc-3.1.0.ebuild:
- Wrote a new ebuild for 3.1.0 based on the old versions.
- I really hope this is much cleaner and more reliable than the
- other ebuilds that have been floating around for BackupPC.
- Hopefully this will make it to the main portage tree one day :)
View
6 app-backup/backuppc/Manifest
@@ -5,8 +5,8 @@ AUX 04-add-docdir-marker.patch 470 RMD160 c077c32a5de7600d0906742510be5bc4612a0d
AUX 05-nicelevel.patch 756 RMD160 a26c588c0936f2d3f129aed4c5bbfbada3fef075 SHA1 e1db6fc9c2f450df08162218cb3680da407f3d47 SHA256 a707a592754fadc92a769a488518b355468afa8d57a280e29adff4e8c4384566
AUX apache2-backuppc.conf 3057 RMD160 c9ad1329302296cc1cbce8c0d48989719872da65 SHA1 36d95931bb6dff59712b7511bf34b6b18486fa11 SHA256 7d832145226cc64386338001709e7fa9da9073b0788d6bf31f25b7d1b4e95a4b
AUX apache2-backuppc.init 3800 RMD160 9a4a4c55671738447ef131480ca41506baf947b8 SHA1 6ffef133a0b523e4e0d428b8a5282632303d61a2 SHA256 a8b29805a82315f47e0b8e8583c530ba0e4c0b0393001bed4cd2759c2a0c6bb9
-AUX httpd.conf 11970 RMD160 cf78a935be057d2319b597415f0dbfd7b702aaaf SHA1 ebd180f921003dc196d2add9fa024ab6ca21b44c SHA256 3f6b7a3fa90b76ffafd6e2b2c4119c31429c27b836092b69d8b3a2da0e5e5aee
+AUX httpd.conf 11857 RMD160 f2eac3a1f88cc5ac7420d33dc4c6e61e7aa49357 SHA1 ce6c673ac2ce5ed11bc640fcc8b50cadbf6d78ca SHA256 20a5e1b7c9c0ccd0627a72c9bc8b4b6febcecf8912a990516373ea5899d33d9c
DIST BackupPC-3.1.0.tar.gz 474981 RMD160 22d4cb6dd76f846fde489a301852f50e8db1ae1d SHA1 3bd6d637f4f08f2fda44a12668b91d47c4abb0a7 SHA256 49a2744cb9aaf27b298ec3d2e83e46fdb86fb3596922beb3904cb6ae552c148a
-EBUILD backuppc-3.1.0-r1.ebuild 6027 RMD160 dd4a84c3f87162d1e032ac704f7578734dea056a SHA1 f85d693157b3ddc29e7a5171ced999033d299da2 SHA256 ba61cf6afd40113b66c8bca0751ed8631bce52bec3d1560b044fe6b277539062
-MISC ChangeLog 342 RMD160 e519fdeee910c6600b246ee7e70003643e639036 SHA1 591541d1b4f85bb49e917c9885e5c1c67c02fee2 SHA256 406d2132b8c3fe7a49eff9f8e3a05f80e04fb08ced6790218a95e39dbaf7881f
+EBUILD backuppc-3.1.0-r2.ebuild 6027 RMD160 59020073b4d7b192dfca2b550ec0f7a3f77df986 SHA1 0f60f08982fdc942360b36e2222f054abff94422 SHA256 8f67e700d80af0654e4e8b79c494cd03afa2ff3d47f7b4f7a07ae44ad92dce81
+MISC ChangeLog 228 RMD160 011727c5e4b5e3c01af5bbfbdaa47373da5ec0c8 SHA1 44be7cd2d4f0ed9f98c9fcb640f37e2067f5b6cf SHA256 7f50b18c97761a7b351b4dc360f87ecbde63952946c9304c91c7b817b8834f89
MISC metadata.xml 505 RMD160 080f7450920b9079a7436a05fb03c1a626c938fc SHA1 d42059212c110b63ee0590a3cc50c86adea635f4 SHA256 2c461cd601ed00f142b5994f2998df2308a47f79c46c1016e83b4109fb9d044e
View
2 app-backup/backuppc/backuppc-3.1.0-r1.ebuild → app-backup/backuppc/backuppc-3.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
View
6 app-backup/backuppc/files/httpd.conf
@@ -235,16 +235,14 @@ NameVirtualHost *:80
# kill -HUP will prompt again. Keep in mind that if you have both an RSA
# and a DSA certificate you can configure both in parallel (to also allow
# the use of DSA ciphers, etc.)
- SSLCertificateFile /etc/apache2/ssl/server.crt
- #SSLCertificateFile /etc/apache2/ssl/server-dsa.crt
+ SSLCertificateFile /etc/ssl/apache2/server.crt
## Server Private Key:
# If the key is not combined with the certificate, use this directive to
# point at the key file. Keep in mind that if you've both a RSA and a DSA
# private key you can configure both in parallel (to also allow the use of
# DSA ciphers, etc.)
- SSLCertificateKeyFile /etc/apache2/ssl/server.key
- #SSLCertificateKeyFile /etc/apache2/ssl/server-dsa.key
+ SSLCertificateKeyFile /etc/ssl/apache2/server.key
<FilesMatch "\.(cgi|shtml|phtml|php)$">
SSLOptions +StdEnvVars
</FilesMatch>

0 comments on commit faabe31

Please sign in to comment.