cloud-mu 3.6.9 → 3.6.11

data/cookbooks/nagios/templates/servicedependencies.cfg.erb

@@ -0,0 +1,15 @@
+# $Id: Generated by chef for node: <%= node['hostname'] %>
+# ----------------------------------------------------------------
+# NOTE: This file is controlled by chef templates!
+# Do not edit or change this file but change the following:
+# template file : servicedependencies.cfg.erb
+# ----------------------------------------------------------------
+# Service Dependency Definitions
+# ----------------------------------------------------------------
+
+<% Nagios.instance.servicedependencies.each do |key,dependency| -%>
+<% if dependency.name.nil? # Skipping all the template servicedependencies %>
+<%= dependency.definition %>
+
+<% end %>
+<% end -%>

data/cookbooks/nagios/templates/servicegroups.cfg.erb

@@ -0,0 +1,14 @@
+# ----------------------------------------------------------------
+# NOTE: This file is controlled by chef templates!
+# Do not edit or change this file but change the following:
+# template file : servicegroups.cfg.erb
+# ----------------------------------------------------------------
+# Servicegroup definitions
+# ----------------------------------------------------------------
+
+<% Nagios.instance.servicegroups.each do |key,servicegroup| -%>
+<% if servicegroup.name.nil? # Skipping all the template servicegroups %>
+<%= servicegroup.definition %>
+
+<% end %>
+<% end -%>

data/cookbooks/nagios/templates/services.cfg.erb

@@ -0,0 +1,14 @@
+# ----------------------------------------------------------------
+# NOTE: This file is controlled by chef templates!
+# Do not edit or change this file but change the following:
+# template file : services.cfg.erb
+# ----------------------------------------------------------------
+# Service definitions
+# ----------------------------------------------------------------
+
+<% Nagios.instance.services.each do |key,service| -%>
+<% if service.name.nil? # Skipping all the template services %>
+<%= service.definition %>
+
+<% end %>
+<% end -%>

data/cookbooks/nagios/templates/spawn-fcgi.erb

@@ -0,0 +1,10 @@
+# 
+# Generated by chef for node: <%= node['hostname'] %>
+#
+FCGI_SOCKET=<%= node['nagios']['server']['nginx_dispatch']['cgi_url'].split(':').last  %>
+## FCGI_PROGRAM=/usr/bin/php-cgi
+FCGI_PROGRAM=/usr/sbin/fcgiwrap
+FCGI_USER=<%= @nginx_user %>
+FCGI_GROUP=<%= @nginx_user %>
+FCGI_EXTRA_OPTIONS="-M 0750"
+OPTIONS="-u $FCGI_USER -g $FCGI_GROUP -s $FCGI_SOCKET -S $FCGI_EXTRA_OPTIONS -F 1 -P /var/run/spawn-fcgi.pid -- $FCGI_PROGRAM"

data/cookbooks/nagios/templates/templates.cfg.erb

@@ -0,0 +1,31 @@
+# $Id: Generated by chef for node: <%= node['hostname'] %>
+# ----------------------------------------------------------------
+# NOTE: This file is controlled by chef templates!
+# Do not edit or change this file but change the following:
+# template file : templates.cfg.erb
+# ----------------------------------------------------------------
+# Contact definitions
+# Host definitions
+# Service definitions
+# ----------------------------------------------------------------
+
+<% Nagios.instance.contacts.each do |key,contact| -%>
+<% if contact.name # Only get all the template contacts %>
+<%= contact.definition %>
+
+<% end %>
+<% end -%>
+
+<% Nagios.instance.hosts.each do |key,host| -%>
+<% if host.name # Only get all the template hosts %>
+<%= host.definition %>
+
+<% end %>
+<% end -%>
+
+<% Nagios.instance.services.each do |key,service| -%>
+<% if service.name # Only get all the template services %>
+<%= service.definition %>
+
+<% end %>
+<% end -%>

data/cookbooks/nagios/templates/timeperiods.cfg.erb

@@ -0,0 +1,13 @@
+# $Id: Generated by chef for node: <%= node['hostname'] %>
+# ----------------------------------------------------------------
+# NOTE: This file is controlled by chef templates!
+# Do not edit or change this file but change the following:
+# template file : timeperiods.cfg.erb
+# ----------------------------------------------------------------
+# Time period definitions
+# ----------------------------------------------------------------
+
+<% Nagios.instance.timeperiods.each do |entry,timeperiod| -%>
+<%= timeperiod.definition %>
+
+<% end -%>

data/extras/platform_berksfile_base

@@ -6,16 +6,16 @@ if ENV.include? "MU_COOKBOOK_ROOT"
   siteCookbookPath = "#{ENV['MU_COOKBOOK_ROOT']}/site_cookbooks"
   if ENV.include? "MU_DEPRESOLVE"
     ["cookbooks", "site_cookbooks"].each { |dir|
-      next if !Dir.exists?(ENV['MU_COOKBOOK_ROOT']+"/"+dir)
+      next if !Dir.exist?(ENV['MU_COOKBOOK_ROOT']+"/"+dir)
       Dir.foreach(ENV['MU_COOKBOOK_ROOT']+"/"+dir).each { |cb|
         next if cb == "." or cb == ".."
         path = ENV['MU_COOKBOOK_ROOT']+"/"+dir+"/"+cb
-        next if !File.exists?(path+"/metadata.rb") and !File.exists?(path+"/metadata.json")
+        next if !File.exist?(path+"/metadata.rb") and !File.exist?(path+"/metadata.json")
         addtl_cookbooks[cb] = { "path" => path }
       }
     }
     # now to smoke some rocks
-    if File.exists?("#{ENV['MU_COOKBOOK_ROOT']}/Berksfile.lock")
+    if File.exist?("#{ENV['MU_COOKBOOK_ROOT']}/Berksfile.lock")
       in_deps = false
       File.open("#{ENV['MU_COOKBOOK_ROOT']}/Berksfile.lock").each { |line|
         if in_deps

data/extras/python_rpm/build.sh

@@ -5,17 +5,17 @@ rpm -q rpm-build || yum -y install rpm-build
 base="/opt/mu/lib/extras/python_rpm"
 
 for d in BUILD BUILDROOT RPMS SOURCES SPECS SRPMS;do
-  mkdir -p ~/rpmbuild/$d
+  mkdir -p /root/rpmbuild/$d
 done
-cd ~/rpmbuild
+cd /root/rpmbuild
 
 echo "Temporarily deleting /usr/local/python-current so rpmbuild can create it"
 link="`readlink /usr/local/python-current`"
 rm -f /usr/local/python-current
 chmod 000 /usr/bin/python # otherwise this brain-dead build system tries to compile parts of itself with the wrong executable
-env -i PATH="/bin:/usr/bin" /usr/bin/rpmbuild -ba $base/muthon.spec
+env -i HOME=/root PATH="/bin:/usr/bin" /usr/bin/rpmbuild -ba $base/muthon.spec
 chmod 755 /usr/bin/python
-find ~/rpmbuild/ -type f -name 'muthon*' -exec ls -la {} \;
+find /root/rpmbuild/ -type f -name 'muthon*' -exec ls -la {} \;
 if [ "$link" != "" ];then
   ln -s "$link" /usr/local/python-current
 fi

data/extras/python_rpm/muthon.spec

@@ -1,7 +1,7 @@
 Summary: Python for Mu
 BuildArch: x86_64
 Name: muthon
-Version: 3.8.3
+Version: 3.13.1
 Release: 1%{dist}
 Group: Development/Languages
 License: https://docs.python.org/3/license.html
@@ -12,9 +12,6 @@ Source: https://www.python.org/ftp/python/%{version}/Python-%{version}.tgz
 # auto-require inserts nonsensical things, like a dependency on our own
 # executable, so I guess we'll declare dependencies by package ourselves
 AutoReq: no
-# XXX these don't work for some reason
-#%global __requires_exclude ^/usr/local/bin/python$
-#%global __requires_exclude ^/opt/pythons/Python-%{version}/bin/python.*$
 
 %{?el6:BuildRequires: mussl}
 %{?el6:BuildRequires: muqlite}
@@ -63,6 +60,7 @@ env -i PATH="/bin:/usr/bin" make
 %install
 cd $RPM_BUILD_DIR/Python-%{version}
 env -i PATH="/bin:/usr/bin" make install
+sed -i 's/^#!\/usr\/bin\/env python/\/usr\/bin\/python3/' /opt/pythons/Python-3.13.1/lib/python3.13/encodings/rot_13.py
 %{prefix}/Python-%{version}/bin/python3 $RPM_SOURCE_DIR/get-pip.py --prefix %{prefix}/Python-%{version}/ || ( ldd %{prefix}/Python-%{version}/bin/python3 ; exit 1 )
 mkdir -p $RPM_BUILD_ROOT%{prefix}
 mv %{prefix}/Python-%{version} $RPM_BUILD_ROOT%{prefix}/

data/extras/vault_tools/export_vaults.sh

@@ -1,3 +1,13 @@
 #!/bin/bash
 # Exports existing vaults to a vaults directory for use by test_vaults and recreate_vaults
-mkdir -p ~/vaults ; for i in `knife data bag list | grep -vE -- '-[0-9]{10}-'`;do echo $i; mkdir -p vaults/$i ; for j in `knife data bag show $i | grep -v '_keys$'`;do echo "   $j"; knife vault show $i $j -F json > vaults/$i/$j.json;done;done ; find vaults -empty -delete
+mkdir -p ~/vaults
+cd
+for i in `knife vault list | egrep -v '^INFO:'`;do
+  echo "VAULTNAME: $i"
+  mkdir -p vaults/$i
+  for j in `knife data bag show $i | egrep -v '^INFO:|_keys$'`;do
+    echo "   ITEM: $j"
+    knife vault show "$i" "$j" -F json | grep -v '^INFO:' > ~/vaults/$i/$j.json
+  done
+done
+find ~/vaults -empty -delete

data/install/installer

@@ -4,7 +4,7 @@
 yum -y install git dmidecode
 BOLD=`tput bold`
 NORM=`tput sgr0`
-CHEF_CLIENT_VERSION="18.5.0"
+CHEF_CLIENT_VERSION="18.7.6"
 if [ "$MU_BRANCH" == "" ];then
   MU_BRANCH="master"
   mydir="`dirname $0`"