Merge pull request #17 in IAAS/cis-hardening from dev/kevin.tanguy/wheezy to master

* commit 'f3e582c957c8b54a7f4d7b3dc192ab984feaa125':
  Debian package revision bump 1.0-6
This commit is contained in:
Thibault Dewailly 2016-04-22 14:47:46 +02:00
commit 22fcd6ca74
5 changed files with 14 additions and 6 deletions

View File

@ -1,7 +1,7 @@
# CIS Debian 7 Hardening # CIS Debian 7 Hardening
Modular Debian 7 security hardening scripts based on [cisecurity.org](cisecurity.org) Modular Debian 7 security hardening scripts based on [cisecurity.org](https://www.cisecurity.org)
recommendations. We use it at [OVH](https://ovh.com) to harden our PCI-DSS infrastructure. recommendations. We use it at [OVH](https://www.ovh.com) to harden our PCI-DSS infrastructure.
```console ```console
$ bin/hardening.sh --audit-all $ bin/hardening.sh --audit-all

7
debian/changelog vendored
View File

@ -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 <kevin.tanguy@ovh.net> Fri, 22 Apr 2016 14:27:40 +0200
cis-hardening (1.0-5) wheezy; urgency=low cis-hardening (1.0-5) wheezy; urgency=low
* typo fix / phrasing reworked * typo fix / phrasing reworked

View File

@ -4,8 +4,8 @@ cis-hardening - CIS Debian 7 Hardening
.PP .PP
.SH DESCRIPTION .SH DESCRIPTION
.PP .PP
Modular Debian 7 security hardening scripts based on cisecurity.org \[la]cisecurity.org\[ra] Modular Debian 7 security hardening scripts based on cisecurity.org \[la]https://www.cisecurity.org\[ra]
recommendations. We use it at OVH \[la]https://ovh.com\[ra] to harden our PCI\-DSS infrastructure. recommendations. We use it at OVH \[la]https://www.ovh.com\[ra] to harden our PCI\-DSS infrastructure.
.PP .PP
.RS .RS
.nf .nf

1
debian/conffiles vendored
View File

@ -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/1.1_install_updates.cfg
/opt/cis-hardening/etc/conf.d/2.1_tmp_partition.cfg /opt/cis-hardening/etc/conf.d/2.1_tmp_partition.cfg
/opt/cis-hardening/etc/conf.d/2.2_tmp_nodev.cfg /opt/cis-hardening/etc/conf.d/2.2_tmp_nodev.cfg

4
debian/rules vendored
View File

@ -22,12 +22,12 @@ override_dh_install:
cp README.md $(CURDIR)/debian/$(PACKAGE)/opt/$(PACKAGE)/ cp README.md $(CURDIR)/debian/$(PACKAGE)/opt/$(PACKAGE)/
cp -R bin $(CURDIR)/debian/$(PACKAGE)/opt/$(PACKAGE)/ cp -R bin $(CURDIR)/debian/$(PACKAGE)/opt/$(PACKAGE)/
# /!\ tag /opt/$(PACKAGE)/etc/conf.d/* as configuration files in conffiles # /!\ 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 etc $(CURDIR)/debian/$(PACKAGE)/opt/$(PACKAGE)/
cp -R lib $(CURDIR)/debian/$(PACKAGE)/opt/$(PACKAGE)/ cp -R lib $(CURDIR)/debian/$(PACKAGE)/opt/$(PACKAGE)/
# cleanup git stuff if any # cleanup git stuff if any
find $(CURDIR)/debian/$(PACKAGE) -type f -name .gitignore -delete find $(CURDIR)/debian/$(PACKAGE) -type f -name .gitignore -delete
override_dh_installdocs: override_dh_installdocs:
dh_installdocs dh_installdocs