diff options
author | Michael Elkins <melkins@tislabs.com> | 2013-03-14 23:15:58 +0000 |
---|---|---|
committer | Michael Elkins <melkins@tislabs.com> | 2013-03-14 23:15:58 +0000 |
commit | 3872865f3daeea12268393eff2c8e9f0a2a7a4d0 (patch) | |
tree | c876f3b3966f7819ff496df5e81b677100101095 /buildtools | |
parent | 6d7ac78c4060b53be11d6834b6ece103e002ec50 (diff) |
fix test for existance of inclusion of apache.conf in rpki-ca.postinst
closes #469
svn path=/trunk/; revision=5156
Diffstat (limited to 'buildtools')
-rw-r--r-- | buildtools/debian-skeleton/rpki-ca.postinst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/buildtools/debian-skeleton/rpki-ca.postinst b/buildtools/debian-skeleton/rpki-ca.postinst index 57d0872c..68daa7b7 100644 --- a/buildtools/debian-skeleton/rpki-ca.postinst +++ b/buildtools/debian-skeleton/rpki-ca.postinst @@ -24,7 +24,7 @@ setup_apache() { f=/etc/apache2/sites-available/default-ssl conf=/etc/rpki/apache.conf cmd=no - if test "x$(grep -q "[^#]*Include $conf" $f)" = "x" + if test "$(grep "[^#]*Include $conf" $f 2>/dev/null)" = "" then awk < $f > ${f}.tmp -v conf=$conf ' $0 ~ /[^#]*<\/VirtualHost>/ { print "Include", conf } |