Merge pull request #8 from ekohl/remove-old-os-support

Drop Debian <= 7, Ubuntu <= 14.04, EL < 7 and SLES < 12

Author: bastelfreak

resources/puppetlabs/lein-ezbake/staging-templates/project_data.yaml.mustache

@@ -17,7 +17,6 @@ files:
   - version
   - Gemfile
   - Rakefile
-  - Makefile.erb
   - puppet
   - install.sh.erb
   - ext/fpm.rb
@@ -32,8 +31,6 @@ templates:
     target: ext/debian/{{{project}}}.service_file
   - source: ext/ezbake.logrotate.conf.erb
     target: ext/{{{project}}}.logrotate.conf
-  - source: ext/ezbake.logrotate-legacy.conf.erb
-    target: ext/{{{project}}}.logrotate-legacy.conf
   - source: ext/ezbake.tmpfiles.conf.erb
     target: ext/{{{project}}}.tmpfiles.conf
   - source: ext/ezbake.needrestart.conf.erb
@@ -42,8 +39,6 @@ templates:
   - ext/redhat/postinst.erb
   - ext/redhat/prerm.erb
   - ext/redhat/postrm.erb
-  - ext/redhat/init.erb
-  - ext/redhat/init.suse.erb
   - ext/debian/postrm.erb
   - ext/debian/preinst.erb
   - ext/debian/prerm.erb
@@ -55,7 +50,6 @@ templates:
   - ext/cli_defaults/*.erb
   - ext/default.erb
   - ext/ezbake-functions.sh.erb
-  - Makefile.erb
   - install.sh.erb
   - controller.sh.erb
 tar_excludes:

resources/puppetlabs/lein-ezbake/template/global/Makefile.erb

@@ -26,16 +26,6 @@ if [ ! -d "$basepath/systemd_el" ]; then
         cp -r "$basepath/base" "$basepath/systemd_el"
         DESTDIR="$basepath/systemd_el" bash install.sh systemd_redhat
 fi
-if [ ! -d "$basepath/old_el" ]; then
-        cp -r "$basepath/base" "$basepath/old_el"
-        DESTDIR="$basepath/old_el" bash install.sh sysv_init_redhat
-fi
-if [ ! -d "$basepath/old_sles" ]; then
-        cp -r "$basepath/base" "$basepath/old_sles"
-        DESTDIR="$basepath/old_sles" bash install.sh sysv_init_suse
-fi
-
-<%- rpm_paths = [ "$basepath/systemd_el", "$basepath/old_el", "$basepath/old_sles" ] -%>
 
 # things are only different if we have docs, deb docs get
 # installed in an unversioned folder but rpm docs get installed
@@ -47,28 +37,12 @@ if [ -d ext/docs ]; then
                         cp -r "$basepath/base_deb" "$basepath/systemd_deb"
                         DESTDIR="$basepath/systemd_deb" bash install.sh systemd_deb
                 fi
-                if [ ! -d "$basepath/systemd_notasksmax_deb" ]; then
-                        cp -r "$basepath/base_deb" "$basepath/systemd_notasksmax_deb"
-                        DESTDIR="$basepath/systemd_notasksmax_deb" USE_TASKSMAX=false bash install.sh systemd_deb
-                fi
-                if [ ! -d "$basepath/sysvinit_deb" ]; then
-                        cp -r "$basepath/base_deb" "$basepath/sysvinit_deb"
-                        DESTDIR="$basepath/sysvinit_deb" bash install.sh sysv_init_deb
-                fi
         fi
 else
         if [ ! -d "$basepath/systemd_deb" ]; then
                 cp -r "$basepath/base" "$basepath/systemd_deb"
                 DESTDIR="$basepath/systemd_deb" bash install.sh systemd_deb
         fi
-        if [ ! -d "$basepath/systemd_notasksmax_deb" ]; then
-                cp -r "$basepath/base" "$basepath/systemd_notasksmax_deb"
-                DESTDIR="$basepath/systemd_notasksmax_deb" USE_TASKSMAX=false bash install.sh systemd_deb
-        fi
-        if [ ! -d "$basepath/sysvinit_deb" ]; then
-                cp -r "$basepath/base" "$basepath/sysvinit_deb"
-                DESTDIR="$basepath/sysvinit_deb" bash install.sh sysv_init_deb
-        fi
 fi
 
 os=$build_os
@@ -82,33 +56,11 @@ case $os in
         # there's no differences in packaging for deb vs ubuntu
         # if that changes we'll need to fix this
         debian|ubuntu)
-                if [ "$os_dist" = 'trusty' ]; then
-                        dir="$basepath/sysvinit_deb"
-                elif [ "$os_dist" = 'jessie' ]; then
-                        # the version of systemd that ships with jessie doesn't
-                        # support TasksMax
-                        dir="$basepath/systemd_notasksmax_deb"
-                else
-                        dir="$basepath/systemd_deb"
-                fi
-                ;;
-        el|redhatfips)
-                if [ "$os_version" -gt '6' ]; then
-                        dir="$basepath/systemd_el"
-                else
-                        dir="$basepath/old_el"
-                fi
+                dir="$basepath/systemd_deb"
                 ;;
-        amazon)
+        amazon|el|redhatfips|sles)
                 dir="$basepath/systemd_el"
                 ;;
-        sles)
-                if [ "$os_version" -gt '11' ]; then
-                        dir="$basepath/systemd_el"
-                else
-                        dir="$basepath/old_sles"
-                fi
-                ;;
         *)
                 echo "I have no idea what I'm doing with $os, teach me?" >&2
                 exit 1
@@ -144,11 +96,7 @@ params+=('--termini-description' "$(printf "$termini_description")")
 <% end -%>
 
 <% if EZBake::Config[:logrotate_enabled]-%>
-if [[ "$dir" =~ old_ ]]; then
-        DESTDIR=$dir bash install.sh logrotate_legacy
-else
-        DESTDIR=$dir bash install.sh logrotate
-fi
+DESTDIR=$dir bash install.sh logrotate
 params+=('--logrotate')
 <% end -%>
 
@@ -171,27 +119,23 @@ if [[ "$os" = 'el' || "$os" = 'sles' || "$os" = 'fedora' || "$os" = 'redhatfips'
                 params+=("<%= dep -%>")
         <% end -%>
         # get rpm install trigger scripts
-        <% EZBake::Config[:redhat][:postinst_install_triggers].each do |package, scripts|
-             rpm_paths.each do |path| -%>
-              cat > <%=path %>/<%=package%>_postinst_triggers <<EOM
+        <% EZBake::Config[:redhat][:postinst_install_triggers].each do |package, scripts| -%>
+              cat > $basepath/systemd_el/<%=package%>_postinst_triggers <<EOM
               if [ "\$1" -eq 1 ] ; then
                  "<%= scripts.join("\n") %>"
                  :
               fi
 EOM
-            <% end -%>
             params+=("--rpm-trigger" "'<%=package%>: $dir/<%=package%>_postinst_triggers'")
         <% end -%>
         # get rpm upgrade trigger scripts
-        <% EZBake::Config[:redhat][:postinst_upgrade_triggers].each do |package, scripts|
-             rpm_paths.each do |path| -%>
-             cat > <%=path %>/<%=package%>_postinst_triggers <<EOM
+        <% EZBake::Config[:redhat][:postinst_upgrade_triggers].each do |package, scripts| -%>
+             cat > $basepath/systemd_el/<%=package%>_postinst_triggers <<EOM
               if [ "\$1" -gt 1 ] ; then
                  "<%= scripts.join("\n") %>"
                  :
               fi
 EOM
-               <% end -%>
             params+=("--rpm-trigger" "'<%=package%>: $dir/<%=package%>_postinst_triggers'")
         <% end -%>
         : # Need something in case there are no additional dependencies

resources/puppetlabs/lein-ezbake/template/global/controller.sh.erb

@@ -6,12 +6,8 @@
 
 options = OpenStruct.new
 # settin' some defaults
-options.systemd = 0
-options.sysvinit = 0
 options.systemd_el = 0
 options.systemd_sles = 0
-options.old_el = 0
-options.old_sles = 0
 options.sles = 0
 options.java = 'java-1.8.0-openjdk-headless'
 options.release = 1
@@ -140,17 +136,9 @@
 if options.sources.empty?
   options.sources = case options.operating_system
                     when :amazon, :fedora, :sles, :el, :redhatfips
-                      if options.operating_system == :el && options.os_version < 7 || options.operating_system == :sles && options.os_version < 12 #sysv rpm platforms
-                        ['etc', 'opt', 'var']
-                      else
-                        ['etc', 'opt', 'usr', 'var']
-                      end
+                      ['etc', 'opt', 'usr', 'var']
                     when :debian, :ubuntu
-                      if options.dist == 'trusty' #trusty is the only sysv deb we build for right now
-                        ['etc', 'opt', 'var']
-                      else
-                        ['etc', 'lib', 'opt', 'usr', 'var']
-                      end
+                      ['etc', 'lib', 'opt', 'usr', 'var']
                     else
                       fail "I don't know what your default sources should be, pass it on the command line!"
                     end
@@ -177,17 +165,15 @@
   fpm_opts << "--rpm-rpmbuild-define '_app_data #{options.app_data}'"
 
   if options.operating_system == :fedora # all supported fedoras are systemd
-    options.systemd = 1
     options.systemd_el = 1
   elsif options.operating_system == :amazon
     if ! options.is_pe
       fpm_opts << "--depends tzdata-java"
       options.java = '(java-17-amazon-corretto-headless or java-11-amazon-corretto-headless)'
     end
 
-    options.systemd = 1
     options.systemd_el = 1
-  elsif options.operating_system == :el && options.os_version >= 7 # systemd el
+  elsif options.operating_system == :el
     if ! options.is_pe
       options.java =
         if options.os_version == 7
@@ -199,45 +185,26 @@
         end
     end
 
-    options.systemd = 1
     options.systemd_el = 1
-  elsif options.operating_system == :el # old el
-    options.sysvinit = 1
-    options.old_el = 1
-  elsif options.operating_system == :redhatfips && options.os_version >= 7 # systemd redhatfips
-    options.systemd = 1
+  elsif options.operating_system == :redhatfips
     options.systemd_el = 1
-  elsif options.operating_system == :sles && options.os_version >= 12 # systemd sles
-    options.systemd = 1
+  elsif options.operating_system == :sles
     options.systemd_sles = 1
     options.sles = 1
     if ! options.is_pe
       options.java = 'java-11-openjdk-headless'
     end
-  elsif options.operating_system == :sles #old sles
-    options.sysvinit = 1
-    options.old_sles = 1
   end
 
-  fpm_opts << "--rpm-rpmbuild-define '_with_sysvinit #{options.sysvinit}'"
-  fpm_opts << "--rpm-rpmbuild-define '_with_systemd #{options.systemd}'"
-  fpm_opts << "--rpm-rpmbuild-define '_old_sles #{options.old_sles}'"
   fpm_opts << "--rpm-rpmbuild-define '_systemd_el #{options.systemd_el}'"
   fpm_opts << "--rpm-rpmbuild-define '_systemd_sles #{options.systemd_sles}'"
-  fpm_opts << "--rpm-rpmbuild-define '_old_el #{options.old_el}'"
   fpm_opts << "--rpm-rpmbuild-define '_sysconfdir /etc'"
   fpm_opts << "--rpm-rpmbuild-define '_prefix #{options.app_prefix}'"
   fpm_opts << "--rpm-rpmbuild-define '_rundir /var/run'"
   fpm_opts << "--rpm-rpmbuild-define '__jar_repack 0'"
 
   shared_opts << "--rpm-dist #{options.dist}"
 
-  if options.old_el == 1
-    fpm_opts << "--depends chkconfig"
-  elsif options.old_sles == 1
-    fpm_opts << "--depends aaa_base"
-  end
-
   if options.systemd_el == 1
     fpm_opts << "--depends systemd"
   end
@@ -275,10 +242,7 @@
   fpm_opts << "--rpm-auto-add-exclude-directories /opt/puppetlabs/server/data"
   fpm_opts << "--rpm-auto-add-exclude-directories /usr/lib/systemd"
   fpm_opts << "--rpm-auto-add-exclude-directories /usr/lib/systemd/system"
-  fpm_opts << "--rpm-auto-add-exclude-directories /etc/init.d"
-  fpm_opts << "--rpm-auto-add-exclude-directories /etc/rc.d"
   fpm_opts << "--rpm-auto-add-exclude-directories /etc/logrotate.d"
-  fpm_opts << "--rpm-auto-add-exclude-directories /etc/rc.d/init.d"
   fpm_opts << "--rpm-auto-add-exclude-directories /usr/lib/tmpfiles.d"
   fpm_opts << "--rpm-auto-add-exclude-directories /var/log/puppetlabs"
   fpm_opts << "--rpm-auto-add-exclude-directories /var/run/puppetlabs"