From e878c4c8cc146f881e482064301bfc09f67327e5 Mon Sep 17 00:00:00 2001 From: Mu Administrator Date: Fri, 15 Jun 2018 10:01:27 -0400 Subject: [PATCH] don't try to add non-existent demo_platform repo by default; more lenient guard on rsyslog semanage bit --- bin/mu-configure | 3 ++- cookbooks/mu-tools/recipes/rsyslog.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/mu-configure b/bin/mu-configure index c0fcd77bf..90a957128 100755 --- a/bin/mu-configure +++ b/bin/mu-configure @@ -86,7 +86,8 @@ $CONFIGURABLES = { "callback" => :cloneGitRepo, "changes" => ["chefartifacts", "chefrun"], "array" => true, - "default" => ['https://git.egt-labs.com/mu/demo_platform.git'] +# "default" => ['https://git.egt-labs.com/mu/demo_platform.git'] + "default" => [] }, "master_runlist_extras" => { "title" => "Mu Master Runlist Extras", diff --git a/cookbooks/mu-tools/recipes/rsyslog.rb b/cookbooks/mu-tools/recipes/rsyslog.rb index 86b1f1f8e..eafb4df5d 100644 --- a/cookbooks/mu-tools/recipes/rsyslog.rb +++ b/cookbooks/mu-tools/recipes/rsyslog.rb @@ -35,7 +35,7 @@ package "policycoreutils-python" execute "allow rsyslog to meddle with port 10514" do command "/usr/sbin/semanage port -a -t syslogd_port_t -p tcp 10514" - not_if "/usr/sbin/semanage port -l | grep '^syslogd_port_t.*10514'" + not_if "/usr/sbin/semanage port -l | grep '^syslogd.*10514'" end end