vanagon 0.19.1 → 0.22.0

data/lib/vanagon/project.rb

@@ -351,10 +351,14 @@ class Vanagon
     # will return nil
     #
     # @param [string] name of service to grab
-    # @return [@component.service obj] specific service
+    # @return [@component.service obj] specific service, or array of services
+    #         if there's more than one
     def get_service(name)
       components.each do |component|
         if component.name == name
+          if component.service.size == 1
+            return component.service.first
+          end
           return component.service
         end
       end

data/lib/vanagon/utilities.rb

@@ -10,6 +10,7 @@ require 'timeout'
 require 'English'
 require 'vanagon/extensions/string'
 require 'vanagon/logger'
+require 'vanagon/utilities/extra_files_signer'
 
 class Vanagon
   module Utilities

data/lib/vanagon/utilities/extra_files_signer.rb

@@ -0,0 +1,42 @@
+class Vanagon
+  module Utilities
+    module ExtraFilesSigner
+      class << self
+        def commands(project, mktemp, source_dir) # rubocop:disable Metrics/AbcSize
+          tempdir = nil
+          commands = []
+          # Skip signing extra files if logging into the signing_host fails
+          # This enables things like CI being able to sign the additional files,
+          # but locally triggered builds by developers who don't have access to
+          # the signing host just print a message and skip the signing.
+          Vanagon::Utilities.retry_with_timeout(3, 5) do
+            tempdir = Vanagon::Utilities::remote_ssh_command("#{project.signing_username}@#{project.signing_hostname}", "#{mktemp} 2>/dev/null", return_command_output: true)
+          end
+
+          project.extra_files_to_sign.each do |file|
+            file_location = File.join(tempdir, File.basename(file))
+            local_source_path = File.join('$(tempdir)', source_dir, file)
+            remote_host = "#{project.signing_username}@#{project.signing_hostname}"
+            remote_destination_path = "#{remote_host}:#{tempdir}"
+            remote_file_location = "#{remote_host}:#{file_location}"
+            extra_flags = ''
+            extra_flags = '--extended-attributes' if project.platform.is_macos?
+
+            commands += [
+              "rsync -e '#{Vanagon::Utilities.ssh_command}' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group #{extra_flags} #{local_source_path} #{remote_destination_path}",
+              "#{Vanagon::Utilities.ssh_command} #{remote_host} #{project.signing_command} #{file_location}",
+              "rsync -e '#{Vanagon::Utilities.ssh_command}' --verbose --recursive --hard-links --links  --no-perms --no-owner --no-group #{extra_flags} #{remote_file_location} #{local_source_path}"
+            ]
+          end
+
+          commands
+        rescue RuntimeError
+          require 'vanagon/logger'
+          VanagonLogger.error "Unable to connect to #{project.signing_username}@#{project.signing_hostname}, skipping signing extra files: #{project.extra_files_to_sign.join(',')}"
+          raise if ENV['VANAGON_FORCE_SIGNING']
+          []
+        end
+      end
+    end
+  end
+end

data/resources/deb/postinst.erb

@@ -2,18 +2,29 @@
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv
   #
-  <%- if @platform.servicetype == "systemd" -%>
-if [ -z "$2" ]; then
-  systemctl enable <%= service.name %>.service >/dev/null || :
-else
-  systemctl try-restart <%= service.name %>.service >/dev/null || :
+  <%- if service.init_system.nil? || service.init_system.eql?('systemd') -%>
+if [ -f '/proc/1/comm' ]; then
+  init_comm=`cat /proc/1/comm`
+  if [ "$init_comm" = "systemd" ]; then
+    if [ -z "$2" ]; then
+      systemctl enable <%= service.name %>.service >/dev/null || :
+    else
+      systemctl try-restart <%= service.name %>.service >/dev/null || :
+    fi
+  fi
 fi
-  <%- elsif @platform.servicetype == "sysv" -%>
-if [ -x "<%= service.service_file %>" ]; then
-  update-rc.d <%= service.name %> defaults > /dev/null
+  <%- end -%>
+  <%- if service.init_system.nil? || service.init_system.eql?('sysv') -%>
+if [ -f '/proc/1/comm' ]; then
+  init_comm=`cat /proc/1/comm`
+  if [ "$init_comm" = "init" ]; then
+    if [ -x "<%= service.service_file %>" ]; then
+      update-rc.d <%= service.name %> defaults > /dev/null
 
-  if [ -n "$2" ]; then
-    invoke-rc.d <%= service.name %> condrestart || true
+      if [ -n "$2" ]; then
+        invoke-rc.d <%= service.name %> condrestart || true
+      fi
+    fi
   fi
 fi
   <%- end -%>
@@ -27,17 +38,17 @@ fi
 
 # Set up any specific permissions needed...
 <%- (get_directories + get_configfiles + get_files).select { |pathname| pathname.has_overrides? }.uniq.each do |file_or_directory| -%>
-  <%= "chmod '#{file_or_directory.mode}' '#{file_or_directory.path}'" if file_or_directory.mode %>
+  <%= "chmod '#{file_or_directory.mode}' '#{file_or_directory.path}' &>/dev/null ||:" if file_or_directory.mode %>
   <%- if file_or_directory.owner -%>
     if getent passwd '<%= file_or_directory.owner %>' &> /dev/null; then
-      chown '<%= file_or_directory.owner %>' '<%= file_or_directory.path %>'
+      chown '<%= file_or_directory.owner %>' '<%= file_or_directory.path %>' &>/dev/null ||:
     else
       echo "Error updating '<%= file_or_directory.path %>': user '<%= file_or_directory.owner %>' does not exist."
     fi
   <%- end -%>
   <%- if file_or_directory.group -%>
     if getent group '<%= file_or_directory.group %>' &> /dev/null; then
-      chgrp '<%= file_or_directory.group %>' '<%= file_or_directory.path %>'
+      chgrp '<%= file_or_directory.group %>' '<%= file_or_directory.path %>' &>/dev/null ||:
     else
       echo "Error updating '<%= file_or_directory.path %>': group '<%= file_or_directory.group %>' does not exist."
     fi

data/resources/deb/postrm.erb

@@ -13,11 +13,14 @@ fi
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv
   #
-  <%- if @platform.servicetype == "systemd" -%>
-systemctl daemon-reload >/dev/null 2>&1 || :
-  <%- elsif @platform.servicetype == "sysv" -%>
-if [ "$1" = "purge" ] ; then
-  update-rc.d <%= service.name %> remove > /dev/null
+if [ -f '/proc/1/comm' ]; then
+  init_comm=`cat /proc/1/comm`
+  if [ "$init_comm" = "systemd" ]; then
+    systemctl daemon-reload >/dev/null 2>&1 || :
+  else
+    if [ "$1" = "purge" ] ; then
+      update-rc.d <%= service.name %> remove > /dev/null
+    fi
+  fi
 fi
-  <%- end -%>
 <%- end -%>

data/resources/deb/prerm.erb

@@ -13,15 +13,25 @@ fi
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv
   #
-  <%- if @platform.servicetype == "systemd" -%>
-if [ "$1" = remove ]; then
-  systemctl --no-reload disable <%= service.name %>.service > /dev/null 2>&1 || :
-  systemctl stop <%= service.name %>.service > /dev/null 2>&1 || :
+  <%- if service.init_system.nil? || service.init_system.eql?('systemd') -%>
+if [ -f '/proc/1/comm' ]; then
+  init_comm=`cat /proc/1/comm`
+  if [ "$init_comm" = "systemd" ]; then
+    if [ "$1" = remove ]; then
+      systemctl --no-reload disable <%= service.name %>.service > /dev/null 2>&1 || :
+      systemctl stop <%= service.name %>.service > /dev/null 2>&1 || :
+    fi
+  fi
 fi
-
-  <%- elsif @platform.servicetype == "sysv" -%>
-if [ -x "<%= service.service_file %>" ] && [ "$1" = remove ]; then
-  invoke-rc.d <%= service.name %> stop || true
+  <%- end -%>
+  <%- if service.init_system.nil? || service.init_system.eql?('sysv') -%>
+if [ -f '/proc/1/comm' ]; then
+  init_comm=`cat /proc/1/comm`
+  if [ "$init_comm" = "init" ]; then
+    if [ -x "<%= service.service_file %>" ] && [ "$1" = remove ]; then
+      invoke-rc.d <%= service.name %> stop || true
+    fi
+  fi
 fi
   <%- end -%>
 <%- end -%>

data/resources/rpm/project.spec.erb

@@ -98,7 +98,7 @@ Requires(post): /bin/touch
 <%- end -%>
 
 <%- if has_services? -%>
-  <%- if @platform.servicetype == "systemd" -%>
+  <%- if @platform.get_service_types.include?("systemd") -%>
     <%- if @platform.is_sles? -%>
 BuildRequires:    systemd
 %{?systemd_requires}
@@ -108,7 +108,7 @@ Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
     <%- end -%>
-  <%- elsif @platform.servicetype == "sysv" -%>
+  <%- elsif @platform.get_service_types.include?("sysv") -%>
     <%- if @platform.is_sles? -%>
 Requires: aaa_base
     <%- elsif @platform.is_linux? -%>
@@ -256,15 +256,15 @@ fi
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv vs smf vs aix
   #
-  <%- if @platform.servicetype == "systemd" -%>
+  <%- if @platform.get_service_types.include?("systemd") -%>
     <%- if @platform.is_sles? -%>
       %service_add_post <%= service.name %>.service
     <%- else -%>
       %systemd_post <%= service.name %>.service
     <%- end -%>
-  <%- elsif @platform.servicetype == "sysv" -%>
+  <%- elsif @platform.get_service_types.include?("sysv") -%>
     chkconfig --add <%= service.name %> >/dev/null 2>&1 || :
-  <%- elsif @platform.servicetype == "aix" -%>
+  <%- elsif @platform.get_service_types.include?("aix") -%>
     if /usr/bin/lssrc -s <%= service.name -%> > /dev/null 2>&1; then
       /usr/bin/chssys -s <%= service.name -%> -p <%= service.service_command -%> -w 7 -S -n 15 -f 9 > /dev/null 2>&1 || :
     else
@@ -305,17 +305,17 @@ fi
 <%- get_services.each do |service| -%>
   # switch based on systemd vs systemv vs smf vs aix
   #
-  <%- if @platform.servicetype == "systemd" -%>
+  <%- if @platform.get_service_types.include?("systemd") -%>
     <%- if @platform.is_sles? -%>
       %service_del_postun <%= service.name %>.service
     <%- else -%>
       %systemd_postun_with_restart <%= service.name %>.service
     <%- end -%>
-  <%- elsif @platform.servicetype == "sysv" -%>
+  <%- elsif @platform.get_service_types.include?("sysv") -%>
     if [ "$1" -eq 1 ]; then
       /sbin/service <%= service.name %> condrestart || :
     fi
-  <%- elsif @platform.servicetype == "aix" -%>
+  <%- elsif @platform.get_service_types.include?("aix") -%>
     if  [ "$1" -eq 0 ]; then
       /usr/bin/rmssys -s <%= service.name -%> > /dev/null 2>&1 || :
       /usr/sbin/rmitab <%= service.name -%> > /dev/null 2>&1 || :
@@ -336,18 +336,18 @@ if [ "$1" -eq 0 ] ; then
 fi
 
 <%- get_services.each do |service| -%>
-  <%- if @platform.servicetype == "systemd" -%>
+  <%- if @platform.get_service_types.include?("systemd") -%>
     <%- if @platform.is_sles? -%>
       %service_del_preun <%= service.name %>.service
     <%- else -%>
       %systemd_preun <%= service.name %>.service
     <%- end -%>
-  <%- elsif @platform.servicetype == "sysv" -%>
+  <%- elsif @platform.get_service_types.include?("sysv") -%>
     if [ "$1" -eq 0 ]; then
       /sbin/service <%= service.name %> stop >/dev/null 2>&1 || :
       chkconfig --del <%= service.name %> || :
     fi
-  <%- elsif @platform.servicetype == "aix" -%>
+  <%- elsif @platform.get_service_types.include?("aix") -%>
       # stop the service only on a real uninstall, not on upgrades
       if [ "$1" -eq 0 ] ; then
           /usr/bin/stopsrc -s <%= service.name -%> > /dev/null 2>&1 || :

data/spec/lib/vanagon/cli_spec.rb

@@ -93,13 +93,14 @@ describe Vanagon::CLI::List do
   end
 
   describe "#run" do 
+    let(:defaults){ ['def1', 'def2', 'def3'] }
     let(:projects){ ['foo', 'bar', 'baz'] }
     let(:platforms){ ['1', '2', '3'] }
     let(:output_both){
 "- Projects
-foo
 bar
 baz
+foo
 
 - Platforms
 1
@@ -115,6 +116,9 @@ baz
         expect(Dir).to receive(:exist?)
           .with("#{File.join(Dir.pwd, 'configs', 'projects')}")
           .and_return(true)
+        expect(Dir).to receive(:children)
+          .with("#{File.join(Dir.pwd, 'lib', 'vanagon' ,'cli', '..', 'platform', 'defaults')}")
+          .and_return(defaults)
         expect(Dir).to receive(:children)
           .with("#{File.join(Dir.pwd, 'configs', 'projects')}")
           .and_return(projects)
@@ -124,28 +128,32 @@ baz
       end
       let(:options_empty) { {
         nil=>false, 
-        :configdir=>"#{Dir.pwd}/configs", 
+        :configdir=>"#{Dir.pwd}/configs",
+        :defaults=>false, 
         :platforms=>false, 
         :projects=>false, 
         :use_spaces=>false
       } }
       let(:options_platforms_only) { {
         nil=>false, 
-        :configdir=>"#{Dir.pwd}/configs", 
+        :configdir=>"#{Dir.pwd}/configs",
+        :defaults=>false, 
         :platforms=>true, 
         :projects=>false, 
         :use_spaces=>false
       } }
       let(:options_projects_only) { {
         nil=>false, 
-        :configdir=>"#{Dir.pwd}/configs", 
+        :configdir=>"#{Dir.pwd}/configs",
+        :defaults=>false, 
         :platforms=>false, 
         :projects=>true, 
         :use_spaces=>false
       } }
       let(:options_space_only) { {
         nil=>false, 
-        :configdir=>"#{Dir.pwd}/configs", 
+        :configdir=>"#{Dir.pwd}/configs",
+        :defaults=>false, 
         :platforms=>false, 
         :projects=>false, 
         :use_spaces=>true
@@ -159,7 +167,7 @@ baz
       
       let(:output_both_space){
 "- Projects
-foo bar baz
+bar baz foo
 
 - Platforms
 1 2 3
@@ -186,9 +194,9 @@ foo bar baz
 
       let(:output_projects){
 "- Projects
-foo
 bar
 baz
+foo
 "
 }
       it "outputs only projects when projects is passed" do 
@@ -202,14 +210,19 @@ baz
       let(:options_configdir) { {
         nil=>false, 
         :configdir=> '/configs', 
+        :defaults=>false,
         :platforms=>false, 
         :projects=>false, 
-        :use_spaces=>false} }
+        :use_spaces=>false
+      } }
       it "it successfully takes the configs directory" do 
         expect(Dir).to receive(:exist?).with('/configs' + '/platforms')
           .and_return(true)
         expect(Dir).to receive(:exist?).with('/configs' + '/projects')
           .and_return(true)
+        expect(Dir).to receive(:children)
+          .with("#{File.join(Dir.pwd, 'lib', 'vanagon' ,'cli', '..', 'platform', 'defaults')}")
+          .and_return(defaults)
         expect(Dir).to receive(:children).with('/configs' + '/projects')
           .and_return(projects)
         expect(Dir).to receive(:children).with('/configs' + '/platforms')
@@ -219,5 +232,43 @@ baz
         end.to output(output_both).to_stdout
       end
     end
+
+    context "spec to determine vanagon defaults" do
+      let(:options_default_platforms) { {
+        nil=>false, 
+        :configdir=>"#{Dir.pwd}/configs",
+        :defaults=>true,
+        :platforms=>false, 
+        :projects=>false, 
+        :use_spaces=>false
+      } }
+      let(:output_defaults){
+"- Defaults
+def1
+def2
+def3
+"
+}
+      it "lists the vanagon defaults" do
+        expect(Dir).to receive(:exist?)
+          .with("#{File.join(Dir.pwd, 'configs', 'platforms')}")
+          .and_return(true)
+        expect(Dir).to receive(:exist?)
+          .with("#{File.join(Dir.pwd, 'configs', 'projects')}")
+          .and_return(true)
+        expect(Dir).to receive(:children)
+          .with("#{File.join(Dir.pwd, 'lib', 'vanagon' ,'cli', '..', 'platform', 'defaults')}")
+          .and_return(defaults)
+        expect(Dir).to receive(:children)
+          .with("#{File.join(Dir.pwd, 'configs', 'projects')}")
+          .and_return(projects)
+        expect(Dir).to receive(:children)
+          .with("#{File.join(Dir.pwd, 'configs', 'platforms')}")
+          .and_return(platforms)
+        expect do
+          cli.run(options_default_platforms)
+        end.to output(output_defaults).to_stdout
+      end
+    end
   end
 end

data/spec/lib/vanagon/component/dsl_spec.rb

@@ -34,6 +34,16 @@ end" }
     plat._platform
   }
 
+  let (:dummy_platform_sysv_or_systemd) {
+    plat = Vanagon::Platform::DSL.new('debian-8-x86_64')
+    plat.instance_eval("platform 'debian-8-x86_64' do |plat|
+                       plat.servicetype 'sysv', servicedir: '/etc/init.d'
+                       plat.servicetype 'systemd', servicedir: '/usr/lib/systemd/system'
+                       plat.defaultdir '/etc/default'
+                       end")
+    plat._platform
+  }
+
   let (:dummy_platform_smf) {
     plat = Vanagon::Platform::DSL.new('debian-11-i386')
     plat.instance_eval("platform 'debian-11-i386' do |plat|
@@ -575,15 +585,15 @@ end" }
       expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/etc/init.d/service-test', mode: '0755'))
 
       # The component should now have a service registered
-      expect(comp._component.service.name).to eq('service-test')
+      expect(comp._component.service.flat_map(&:name).compact).to include('service-test')
     end
 
     it 'reads from a file when the OS is AIX for services' do
       comp = Vanagon::Component::DSL.new('service-test', {}, dummy_platform_aix)
       comp.install_service('spec/fixtures/component/mcollective.service', nil, 'mcollective')
-      expect(comp._component.service.name).to eq('mcollective')
-      expect(comp._component.service.service_command).to include('/opt/puppetlabs/puppet/bin/ruby')
-      expect(comp._component.service.service_command).not_to include("\n")
+      expect(comp._component.service.flat_map(&:name).compact).to include('mcollective')
+      expect(comp._component.service.flat_map(&:service_command).compact.first).to include('/opt/puppetlabs/puppet/bin/ruby')
+      expect(comp._component.service.flat_map(&:service_command).compact.first).not_to include("\n")
     end
 
     it 'adds the correct command to the install for the component for systemd platforms' do
@@ -602,7 +612,34 @@ end" }
       expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/usr/lib/systemd/system/service-test.service', mode: '0644'))
 
       # The component should now have a service registered
-      expect(comp._component.service.name).to eq('service-test')
+      expect(comp._component.service.flat_map(&:name).compact).to include('service-test')
+    end
+
+    it 'adds the correct command when installing both systemd and sysv' do
+      comp = Vanagon::Component::DSL.new('service-test', {}, dummy_platform_sysv_or_systemd)
+      comp.install_service('component-client.init', 'component-client.sysconfig', init_system: 'sysv')
+      comp.install_service('component-client.service', 'component-client.sysconfig', init_system: 'systemd')
+      # Look for servicedir creation and copy - sysv
+      expect(comp._component.install).to include("install -d '/etc/init.d'")
+      expect(comp._component.install).to include("cp -p 'component-client.init' '/etc/init.d/service-test'")
+
+      # Look for servicedir creation and copy - systemd
+      expect(comp._component.install).to include("install -d '/usr/lib/systemd/system'")
+      expect(comp._component.install).to include("cp -p 'component-client.service' '/usr/lib/systemd/system/service-test.service'")
+
+      # Look for defaultdir creation and copy
+      expect(comp._component.install).to include("install -d '/etc/default'")
+      expect(comp._component.install).to include("cp -p 'component-client.sysconfig' '/etc/default/service-test'")
+
+      # Look for files and configfiles - sysv
+      expect(comp._component.configfiles).to include(Vanagon::Common::Pathname.configfile('/etc/default/service-test'))
+      expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/etc/init.d/service-test', mode: '0755'))
+
+      # Look for files and configfiles - systemd
+      expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/usr/lib/systemd/system/service-test.service', mode: '0644'))
+
+      # The component should now have a service registered
+      expect(comp._component.service.flat_map(&:name).compact).to include('service-test')
     end
 
     it 'adds the correct command to the install for smf services using a service_type' do
@@ -621,7 +658,7 @@ end" }
       expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/var/svc/manifest/network/service-test.xml', mode: '0644'))
 
       # The component should now have a service registered
-      expect(comp._component.service.name).to eq('service-test')
+      expect(comp._component.service.flat_map(&:name).compact).to include('service-test')
     end
 
     it 'adds the correct command to the install for smf services' do
@@ -640,7 +677,7 @@ end" }
       expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/var/svc/manifest/service-test.xml', mode: '0644'))
 
       # The component should now have a service registered
-      expect(comp._component.service.name).to eq('service-test')
+      expect(comp._component.service.flat_map(&:name).compact).to include('service-test')
     end
 
     it 'installs the file as a link when link_target is specified' do
@@ -661,7 +698,7 @@ end" }
       expect(comp._component.files).to include(Vanagon::Common::Pathname.file('/etc/init.d/service-test'))
 
       # The component should now have a service registered
-      expect(comp._component.service.name).to eq('service-test')
+      expect(comp._component.service.flat_map(&:name).compact).to include('service-test')
     end
   end