don't try to add non-existent demo_platform repo by default; more len…

…ient guard on rsyslog semanage bit
cloudamatic · Jun 15, 2018 · e878c4c · e878c4c
1 parent b19d31b
commit e878c4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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