From 3136adeed57b4e084ffef726639c9dbc6924d563 Mon Sep 17 00:00:00 2001 From: "kevin.tanguy" Date: Fri, 22 Apr 2016 14:29:33 +0200 Subject: [PATCH] Debian package revision bump 1.0-6 --- README.md | 4 ++-- debian/changelog | 7 +++++++ debian/cis-hardening.8 | 4 ++-- debian/conffiles | 1 + debian/rules | 4 ++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f943e2f..a43a1cd 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # CIS Debian 7 Hardening -Modular Debian 7 security hardening scripts based on [cisecurity.org](cisecurity.org) -recommendations. We use it at [OVH](https://ovh.com) to harden our PCI-DSS infrastructure. +Modular Debian 7 security hardening scripts based on [cisecurity.org](https://www.cisecurity.org) +recommendations. We use it at [OVH](https://www.ovh.com) to harden our PCI-DSS infrastructure. ```console $ bin/hardening.sh --audit-all diff --git a/debian/changelog b/debian/changelog index 16cb9ef..da3fb28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cis-hardening (1.0-6) wheezy; urgency=low + + * corrected README.md CIS website address + * corrected conffiles: etc/hardening.cfg was missing + + -- Kevin Tanguy Fri, 22 Apr 2016 14:27:40 +0200 + cis-hardening (1.0-5) wheezy; urgency=low * typo fix / phrasing reworked diff --git a/debian/cis-hardening.8 b/debian/cis-hardening.8 index 71dc13f..19510aa 100644 --- a/debian/cis-hardening.8 +++ b/debian/cis-hardening.8 @@ -4,8 +4,8 @@ cis-hardening - CIS Debian 7 Hardening .PP .SH DESCRIPTION .PP -Modular Debian 7 security hardening scripts based on cisecurity.org \[la]cisecurity.org\[ra] -recommendations. We use it at OVH \[la]https://ovh.com\[ra] to harden our PCI\-DSS infrastructure. +Modular Debian 7 security hardening scripts based on cisecurity.org \[la]https://www.cisecurity.org\[ra] +recommendations. We use it at OVH \[la]https://www.ovh.com\[ra] to harden our PCI\-DSS infrastructure. .PP .RS .nf diff --git a/debian/conffiles b/debian/conffiles index 354c463..9633876 100644 --- a/debian/conffiles +++ b/debian/conffiles @@ -1,3 +1,4 @@ +/opt/cis-hardening/etc/hardening.cfg /opt/cis-hardening/etc/conf.d/1.1_install_updates.cfg /opt/cis-hardening/etc/conf.d/2.1_tmp_partition.cfg /opt/cis-hardening/etc/conf.d/2.2_tmp_nodev.cfg diff --git a/debian/rules b/debian/rules index 9709247..2bff0bb 100755 --- a/debian/rules +++ b/debian/rules @@ -22,12 +22,12 @@ override_dh_install: cp README.md $(CURDIR)/debian/$(PACKAGE)/opt/$(PACKAGE)/ cp -R bin $(CURDIR)/debian/$(PACKAGE)/opt/$(PACKAGE)/ # /!\ tag /opt/$(PACKAGE)/etc/conf.d/* as configuration files in conffiles - # (ls | sort -V | xargs -i echo opt/cis-hardening/etc/conf.d/{} -- without README) + # (ls | sort -V | xargs -i echo /opt/cis-hardening/etc/conf.d/{} -- without README -- with ../hardening.cfg) cp -R etc $(CURDIR)/debian/$(PACKAGE)/opt/$(PACKAGE)/ cp -R lib $(CURDIR)/debian/$(PACKAGE)/opt/$(PACKAGE)/ # cleanup git stuff if any find $(CURDIR)/debian/$(PACKAGE) -type f -name .gitignore -delete - + override_dh_installdocs: dh_installdocs