Merge pull request OpenVoxProject#71 from OpenVoxProject/debian72

Drop Debian <= 7 and Ubuntu <= 14.04 support & Remove sysvinit support on Debian

Author: bastelfreak

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

@@ -25,8 +25,6 @@ templates:
     target: ext/redhat/{{{project}}}.service
   - source: ext/default.erb
     target: ext/debian/{{{project}}}.default_file
-  - source: ext/debian/ezbake.init.erb
-    target: ext/debian/{{{project}}}.init_script
   - source: ext/debian/ezbake.service.erb
     target: ext/debian/{{{project}}}.service_file
   - source: ext/ezbake.logrotate.conf.erb

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

@@ -37,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
@@ -72,15 +56,7 @@ 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
+                dir="$basepath/systemd_deb"
                 ;;
         amazon|el|fedora|redhatfips|sles)
                 dir="$basepath/systemd_el"

resources/puppetlabs/lein-ezbake/template/global/ext/debian/ezbake.init.erb

@@ -13,9 +13,6 @@ if [ $1 = 'configure' -a -n $2 ] ; then
     # Using systemd
     systemctl daemon-reload >/dev/null 2>&1 || :
     systemctl try-restart <%= EZBake::Config[:project] %>.service ||:
-  else
-    # Using sysv
-    invoke-rc.d <%= EZBake::Config[:project] %> try-restart || :
   fi
 fi
 

resources/puppetlabs/lein-ezbake/template/global/ext/debian/postinst.erb

@@ -5,8 +5,5 @@ if [ "$1" = "failed-upgrade" ] || [ "$1" = "remove" ] ; then
     # Using systemd
     systemctl --no-reload disable <%= EZBake::Config[:project] -%>.service > /dev/null 2>&1 || :
     systemctl stop <%= EZBake::Config[:project] -%>.service > /dev/null 2>&1 || :
-  else
-    # Using sysv
-    invoke-rc.d <%= EZBake::Config[:project] -%> stop || :
   fi
 fi

resources/puppetlabs/lein-ezbake/template/global/ext/debian/prerm.erb

@@ -134,11 +134,7 @@
                     when :amazon, :fedora, :sles, :el, :redhatfips
                       ['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

resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb

@@ -77,12 +77,7 @@ function task_service {
     elif [ "$OSFAMILY" = "Debian" ]; then
         unitdir=${unitdir_debian}
         defaultsdir=${defaultsdir_debian}
-        sysv_codenames=("squeeze" "wheezy" "lucid" "precise" "trusty")
-        if $(echo ${sysv_codenames[@]} | grep -q $CODENAME) ; then
-            task install_source_deb_sysv
-        else
-            task install_source_deb_systemd
-        fi
+        task install_source_deb_systemd
     else
         echo "Unsupported platform, exiting ..."
         exit 1
@@ -99,15 +94,6 @@ function task_install_source_rpm_systemd {
     task postinst_permissions
 }
 
-# Source based install for Debian based + sysv setups
-function task_install_source_deb_sysv {
-    task preinst_deb
-    task install_deb
-    task sysv_init_deb
-    task logrotate
-    task postinst_deb
-}
-
 # Source based install for Debian based + systemd setups
 function task_install_source_deb_systemd {
     task preinst_deb
@@ -248,22 +234,11 @@ function task_systemd_redhat {
     install -m 0644 ext/<%= EZBake::Config[:project] %>.tmpfiles.conf "${DESTDIR}${tmpfilesdir}/<%= EZBake::Config[:project] %>.conf"
 }
 
-# Install the sysv and defaults configuration for Debian.
-function task_sysv_init_deb {
-    task defaults_deb
-    install -d -m 0755 "${DESTDIR}${initdir}"
-    install -m 0755 ext/debian/<%= EZBake::Config[:project] %>.init_script "${DESTDIR}${initdir}/<%= EZBake::Config[:project] %>"
-    install -d -m 0755 "${DESTDIR}${rundir}"
-}
-
-# Install the systemd/sysv and defaults configuration for Debian.
+# Install the systemd and defaults configuration for Debian.
 function task_systemd_deb {
-    task sysv_init_deb
+    task defaults_deb
     install -d -m 0755 "${DESTDIR}${unitdir_debian}"
     install -m 0644 ext/debian/<%= EZBake::Config[:project] %>.service_file "${DESTDIR}${unitdir_debian}/<%= EZBake::Config[:project] %>.service"
-    if [ "$USE_TASKSMAX" == "false" ]; then
-      sed -i "s/^TasksMax/# Don't set TasksMax since the option doesn't exist\n# TasksMax/" "${DESTDIR}${unitdir_debian}/<%= EZBake::Config[:project] %>.service"
-    fi
     install -d -m 0755 "${DESTDIR}${tmpfilesdir}"
     install -m 0644 ext/<%= EZBake::Config[:project] %>.tmpfiles.conf "${DESTDIR}${tmpfilesdir}/<%= EZBake::Config[:project] %>.conf"
 }