diff --git a/cfg/1.6/master.yaml b/cfg/1.6/master.yaml index 209f31d..1db170f 100644 --- a/cfg/1.6/master.yaml +++ b/cfg/1.6/master.yaml @@ -731,7 +731,7 @@ groups: - id: 1.4.11 text: "Ensure that the etcd data directory permissions are set to 700 or more restrictive (Scored)" - audit: "ps -ef | grep $etcdbin | grep -v grep | grep -o data-dir=.* | cut -d= -f2 | xargs stat -c %a" + audit: ps -ef | grep $etcdbin | grep -v grep | sed 's%.*data-dir[= ]\(\S*\)%\1%' | xargs stat -c %a tests: test_items: - flag: "700" @@ -748,7 +748,7 @@ groups: - id: 1.4.12 text: "Ensure that the etcd data directory ownership is set to etcd:etcd (Scored)" - audit: "ps -ef | grep $etcdbin | grep -v grep | grep -o data-dir=.* | cut -d= -f2 | xargs stat -c %U:%G" + audit: ps -ef | grep $etcdbin | grep -v grep | sed 's%.*data-dir[= ]\(\S*\)%\1%' | xargs stat -c %U:%G tests: test_items: - flag: "etcd:etcd" diff --git a/cfg/1.7/master.yaml b/cfg/1.7/master.yaml index a306eef..fa35e39 100644 --- a/cfg/1.7/master.yaml +++ b/cfg/1.7/master.yaml @@ -793,7 +793,7 @@ groups: - id: 1.4.11 text: "Ensure that the etcd data directory permissions are set to 700 or more restrictive (Scored)" - audit: "ps -ef | grep $etcdbin | grep -v grep | grep -o data-dir=.* | cut -d= -f2 | xargs stat -c %a" + audit: ps -ef | grep $etcdbin | grep -v grep | sed 's%.*data-dir[= ]\(\S*\)%\1%' | xargs stat -c %a tests: test_items: - flag: "700" @@ -810,7 +810,7 @@ groups: - id: 1.4.12 text: "Ensure that the etcd data directory ownership is set to etcd:etcd (Scored)" - audit: "ps -ef | grep $etcdbin | grep -v grep | grep -o data-dir=.* | cut -d= -f2 | xargs stat -c %U:%G" + audit: ps -ef | grep $etcdbin | grep -v grep | ed 's%.*data-dir[= ]\(\S*\)%\1%' | xargs stat -c %U:%G tests: test_items: - flag: "etcd:etcd" diff --git a/cfg/1.8/master.yaml b/cfg/1.8/master.yaml index 0a3c465..9894f4c 100644 --- a/cfg/1.8/master.yaml +++ b/cfg/1.8/master.yaml @@ -942,7 +942,7 @@ groups: - id: 1.4.11 text: "Ensure that the etcd data directory permissions are set to 700 or more restrictive (Scored)" - audit: "ps -ef | grep $etcdbin | grep -v grep | grep -o data-dir=.* | cut -d= -f2 | xargs stat -c %a" + audit: ps -ef | grep $etcdbin | grep -v grep | sed 's%.*data-dir[= ]\(\S*\)%\1%' | xargs stat -c %a tests: test_items: - flag: "700" @@ -960,7 +960,7 @@ groups: - id: 1.4.12 text: "Ensure that the etcd data directory ownership is set to etcd:etcd (Scored)" - audit: "ps -ef | grep $etcdbin | grep -v grep | grep -o data-dir=.* | cut -d= -f2 | xargs stat -c %U:%G" + audit: ps -ef | grep $etcdbin | grep -v grep | sed 's%.*data-dir[= ]\(\S*\)%\1%' | xargs stat -c %U:%G tests: test_items: - flag: "etcd:etcd"