xolo-server 1.0.0 → 2.0.2

data/lib/xolo/server/title.rb

@@ -72,38 +72,11 @@ module Xolo
       # on the xolo server.
       UNINSTALL_SCRIPT_FILENAME = 'uninstall-script'
 
-      # In the TitleEditor, the version script is
-      # stored as an Extension Attribute - each title can
-      # only have one.
-      # and it needs a 'key', which is the name used to indicate the
-      # EA in various criteria, and is the EA name in Jamf Patch.
-      # The key is this value as a prefix on the title
-      # so for title 'foobar', it is 'xolo-foobar'
-      # That value is also used as the display name
-      TITLE_EDITOR_EA_KEY_PREFIX = Xolo::Server::JAMF_OBJECT_NAME_PFX
-
-      # The EA from the title editor, which is used in Jamf Patch
-      # cannot, unfortunately, be used as a criterion in normal
-      # smart groups or advanced searches.
-      # Since we need a smart group containing all macs with any
-      # version of the title installed, we need a second copy of the
-      # EA as a 'normal' EA.
-      #
-      # (That group is used as an exclusion to any auto-install initial-
-      # install policies, so that those policies don't stomp on the matching
-      # Patch Policies)
-      #
-      # The 'duplicate' EA is named the same as the Titled Editor key
-      # (see TITLE_EDITOR_EA_KEY_PREFIX) with this suffix added.
-      # So for the Title Editor key 'xolo-<title>', we'll also have
-      # a matching normal EA called 'xolo-<title>-installed-version'
-      JAMF_NORMAL_EA_NAME_SUFFIX = '-installed-version'
-
-      JAMF_INSTALLED_GROUP_NAME_SUFFIX = '-installed'
-      JAMF_FROZEN_GROUP_NAME_SUFFIX = '-frozen'
-
-      JAMF_UNINSTALL_SUFFIX = '-uninstall'
-      JAMF_EXPIRE_SUFFIX = '-expire'
+      JAMF_INSTALLED_GROUP_NAME_SUFFIX = 'installed'
+      JAMF_FROZEN_GROUP_NAME_SUFFIX = 'frozen'
+      JAMF_MANUAL_INSTALL_RELEASED_POL_SUFFIX = 'install'
+      JAMF_UNINSTALL_SUFFIX = 'uninstall'
+      JAMF_EXPIRE_SUFFIX = 'expire'
 
       # the expire policy will run this client command,
       # appending the title
@@ -164,20 +137,6 @@ module Xolo
         title_dirs.map(&:basename).map(&:to_s)
       end
 
-      # @return [String] The key and display name of a version script stored
-      #   in the title editor as the ExtAttr for a given title
-      #####################
-      def self.ted_ea_key(title)
-        "#{TITLE_EDITOR_EA_KEY_PREFIX}#{title}"
-      end
-
-      # @return [String] The display name of a version script as a normal
-      #   EA in Jamf, which can be used in Smart Groups and Adv Searches.
-      #####################
-      def self.jamf_normal_ea_name(title)
-        "#{ted_ea_key(title)}#{JAMF_NORMAL_EA_NAME_SUFFIX}"
-      end
-
       # The title dir for a given title on the server,
       # which may or may not exist.
       #
@@ -228,7 +187,8 @@ module Xolo
       # for the given title
       #
       # NOTE: All instantiation should happen using the #instantiate_title method
-      # in the server app instance. Please don't call this method directly
+      # in the server app instance, or related methods like all_title_objects.
+      # Please don't call this method directly
       #
       # @pararm title [String] the title we care about
       # @return [Xolo::Server::Title] load an existing title
@@ -239,6 +199,10 @@ module Xolo
         new parse_json(title_data_file(title).read)
       end
 
+      # Does this title exist in the title editor.
+      # WARNING: Being in the title editor doesn't necessarily mean that this title
+      # is managed
+      #
       # @param title [String] the title we are looking for
       # @pararm cnx [Windoo::Connection] The Title Editor connection to use
       # @return [Boolean] Does the given title exist in the Title Editor?
@@ -325,9 +289,6 @@ module Xolo
       # @return [Xolo::Server::App] our Sinatra server app
       attr_accessor :server_app_instance
 
-      # @return [Integer] The Windoo::SoftwareTitle#softwareTitleId
-      attr_accessor :ted_id_number
-
       # when applying updates, the new data from xadm is stored
       # here so it can be accessed by update-methods
       # and compared to the current instance values
@@ -363,6 +324,13 @@ module Xolo
       #   version being released
       attr_accessor :releasing_version
 
+      # @return [String] The jamf ID of the patch source for this title
+      #   if the title is subscribed. Managed titles are all in the Title Editor source.
+      attr_accessor :jamf_patch_source_id
+
+      # @return [String] The prefix for all jamf objects for this title, which is 'xolo-<title>' or 'xolotest-<title>' for test server
+      attr_reader :jamf_obj_name_pfx
+
       # version_order is defined in ATTRIBUTES
       alias versions version_order
 
@@ -376,19 +344,24 @@ module Xolo
       def initialize(data_hash)
         super
 
-        @ted_id_number ||= data_hash[:ted_id_number]
-        @jamf_patch_title_id ||= data_hash[:jamf_patch_title_id]
+        # ted_id_number and jamf_patch_title_id are now defined in parent classes ATTRIBUTES so are set by super
+
         @version_order ||= []
+
         @new_data_for_update = {}
         @changes_for_update = {}
-        @jamf_installed_group_name = "#{Xolo::Server::JAMF_OBJECT_NAME_PFX}#{data_hash[:title]}#{JAMF_INSTALLED_GROUP_NAME_SUFFIX}"
-        @jamf_frozen_group_name = "#{Xolo::Server::JAMF_OBJECT_NAME_PFX}#{data_hash[:title]}#{JAMF_FROZEN_GROUP_NAME_SUFFIX}"
 
-        @jamf_manual_install_released_policy_name = "#{Xolo::Server::JAMF_OBJECT_NAME_PFX}#{data_hash[:title]}-install"
+        @jamf_obj_name_pfx = "#{jamf_obj_name_pfx_base}#{data_hash[:title]}"
+        @jamf_installed_group_name = "#{jamf_obj_name_pfx}-#{JAMF_INSTALLED_GROUP_NAME_SUFFIX}"
+        @jamf_frozen_group_name = "#{jamf_obj_name_pfx}-#{JAMF_FROZEN_GROUP_NAME_SUFFIX}"
+
+        @jamf_manual_install_released_policy_name = "#{jamf_obj_name_pfx}-#{JAMF_MANUAL_INSTALL_RELEASED_POL_SUFFIX}"
+
+        @jamf_uninstall_script_name = "#{jamf_obj_name_pfx}-#{JAMF_UNINSTALL_SUFFIX}"
+        @jamf_uninstall_policy_name = "#{jamf_obj_name_pfx}-#{JAMF_UNINSTALL_SUFFIX}"
+        @jamf_expire_policy_name = "#{jamf_obj_name_pfx}-#{JAMF_EXPIRE_SUFFIX}"
 
-        @jamf_uninstall_script_name = "#{Xolo::Server::JAMF_OBJECT_NAME_PFX}#{data_hash[:title]}#{JAMF_UNINSTALL_SUFFIX}"
-        @jamf_uninstall_policy_name = "#{Xolo::Server::JAMF_OBJECT_NAME_PFX}#{data_hash[:title]}#{JAMF_UNINSTALL_SUFFIX}"
-        @jamf_expire_policy_name = "#{Xolo::Server::JAMF_OBJECT_NAME_PFX}#{data_hash[:title]}#{JAMF_EXPIRE_SUFFIX}"
+        # DO NOT USE jamf_cnx here, it comes from the server app instance, which is not set until after initialization.
       end
 
       # Instance Methods
@@ -402,10 +375,12 @@ module Xolo
         # @session ||= {}
       end
 
+      # This can be manually set earlier in the request handling to use a non-standard
+      # admin username
       # @return [String]
       ###################
       def admin
-        session[:admin]
+        @admin ||= session[:admin]
       end
 
       # @return [Boolean] Are we creating this title?
@@ -438,6 +413,22 @@ module Xolo
         current_action == :releasing
       end
 
+      # TODO: Remove this when everything has been repaired for v2
+      # and all json files know this value
+      #######################
+      def jamf_patch_title_id
+        return @jamf_patch_title_id if @jamf_patch_title_id
+
+        log_debug "Getting jamf_patch_title_id for title '#{title}'"
+
+        self.jamf_patch_title_id =
+          if managed?
+            jamf_active_managed_titles[title]
+          else
+            jamf_active_subscribed_titles[title]
+          end
+      end
+
       # Append a message to the progress stream file,
       # optionally sending it also to the log
       #
@@ -448,8 +439,8 @@ module Xolo
       #
       # @return [void]
       ###################
-      def progress(msg, log: :debug)
-        server_app_instance.progress msg, log: log
+      def progress(msg, log: :debug, alert: false)
+        server_app_instance.progress msg, log: log, alert: alert
       end
 
       # @return [Windoo::Connection] a single Title Editor connection to use for
@@ -589,13 +580,6 @@ module Xolo
         template_file.read
       end
 
-      # @return [String] The display name of a version script as a normal
-      #   EA in Jamf, which can be used in Smart Groups and Adv Searches.
-      #####################
-      def jamf_normal_ea_name
-        @jamf_normal_ea_name ||= self.class.jamf_normal_ea_name title
-      end
-
       # prepend a new version to the version_order
       #
       # @param version [String] the version to prepend
@@ -603,11 +587,8 @@ module Xolo
       # @return [void]
       ########################
       def prepend_version(version)
-        lock
         version_order.unshift version
         save_local_data
-      ensure
-        unlock
       end
 
       # remove a version from the version_order
@@ -670,8 +651,13 @@ module Xolo
         self.created_by = admin
         log_debug "creation_date: #{creation_date}, created_by: #{created_by}"
 
+        log_debug "TitleData at #create: #{to_h}"
+
         # this will create the title as needed in the Title Editor
+        log_debug "Display Name before creating in ted: #{display_name}"
         create_title_in_ted
+
+        log_debug "Display Name before creating in jamf: #{display_name}"
         create_title_in_jamf
 
         # save to file last, because saving to TitleEd and Jamf will
@@ -679,6 +665,16 @@ module Xolo
         progress 'Saving title data to Xolo server'
         save_local_data
 
+        if subscribed?
+          # create version for latest available
+          # - either autopkg or notification to upload.
+          # See also Helpers::Subscriptions.process_patch_title_updated_webhook
+          Xolo::Server::Version.add_version_via_subscription(
+            title_object: self,
+            new_version: patch_versions(version: :latest)[0][:version]
+          )
+        end # if subscribed
+
         log_change msg: 'Title Created'
 
         # ssvc icon is uploaded in a separate process, and the
@@ -776,6 +772,9 @@ module Xolo
       # @return [void]
       ##########################
       def save_local_data
+        # If we don't have a patch source id yet, get it now
+        self.jamf_patch_source_id ||= Jamf::PatchSource.valid_id(patch_source, cnx: jamf_cnx) if patch_source
+
         # create the dirs for the title
         title_dir.mkpath
         vdir = title_dir + Xolo::Server::Version::VERSIONS_DIRNAME
@@ -838,6 +837,17 @@ module Xolo
         self.uninstall_script &&= Xolo::ITEM_UPLOADED
       end
 
+      # Is AutoPkg integration enabled for the server and title?
+      # This overrides the method in core title, which just checks for the presence of the recipe and dir.
+      ###############################
+      def autopkg_enabled?
+        return @autopkg_enabled if defined?(@autopkg_enabled)
+
+        @autopkg_enabled = server_app_instance.autopkg_enabled? && \
+                           autopkg_recipe && \
+                           autopkg_dir
+      end
+
       # are we uninstallable?
       #
       # @return [Boolean]
@@ -908,10 +918,10 @@ module Xolo
         version_objects.reverse.each do |vers|
           # vers might be nil if it was already deleted
           # e.g. a prev. attempt to delete the title failed partway through
-          vers&.delete update_title: false
+          vers&.delete update_title: false, deleting_title: true
         end
 
-        delete_title_from_ted
+        delete_title_from_ted unless subscribed?
 
         delete_title_from_jamf
 
@@ -940,6 +950,9 @@ module Xolo
 
         update_versions_for_release version_to_release
 
+        # the jamf 'manual install released' policy for the new release
+        # is updated in the release_version method below
+
         # update the title
         self.released_version = version_to_release
         save_local_data
@@ -1008,8 +1021,14 @@ module Xolo
         progress msg, log: :info
 
         pol = jamf_manual_install_released_policy
-        pol.package_ids.each { |pid| pol.remove_package pid }
-        pol.add_package vobj.jamf_pkg_id
+        toggle_jamf_manual_install_released_policy pol, vobj
+
+        if self_service?
+          add_title_to_self_service(pol)
+        else
+          remove_title_from_self_service(pol)
+        end
+
         pol.save
       end
 
@@ -1058,7 +1077,6 @@ module Xolo
       #
       # Then look at the various Jamf objects pertaining to this title, and ensure they are correct
       #   - Accept Patch EA
-      #   - Normal EA 'xolo-<title>-installed-version'
       #   - title-installed smart group 'xolo-<title>-installed'
       #   - frozen static group 'xolo-<title>-frozen'
       #   - manual/SSvc install-current-release policy 'xolo-<title>-install'
@@ -1085,6 +1103,7 @@ module Xolo
         progress "Starting repair of title '#{title}'"
         repair_ted_title
         repair_jamf_title_objects
+        save_local_data
         return unless repair_versions
 
         version_objects.each do |vobj|
@@ -1114,7 +1133,7 @@ module Xolo
 
         exp = Time.now + Xolo::Server::ObjectLocks::OBJECT_LOCK_LIMIT
         Xolo::Server.object_locks[title][:expires] = exp
-        log_debug "Locked title '#{title}' for updates until #{exp}"
+        log_debug "Locked title '#{title}' for updates until #{exp}, by method #{caller_locations.first.label}"
       end
 
       # Unlock this v for updates
@@ -1131,7 +1150,11 @@ module Xolo
       ###########################
       def to_h
         hash = super
+
+        # TODO: remove these after 'repairing' everything for v2
         hash[:ted_id_number] = ted_id_number
+        hash[:jamf_patch_title_id] = jamf_patch_title_id
+
         hash[:ssvc_icon_id] = ssvc_icon_id
         hash
       end

data/lib/xolo/server/version.rb

@@ -223,12 +223,86 @@ module Xolo
         }
       end
 
+      # add a new version in response to a patch title update webhook event.
+      # This doesn't upload a pkg - it just creates the version in Xolo, and then
+      # someone can upload a pkg to it via xadm or autopkg will do it if configured.
+      #
+      # @param title_object [Xolo::Server::Title] the title object for the subscribed title
+      # @param new_version [String] the new version to add
+      # @return [void]
+      ######################
+      def self.add_version_via_subscription(title_object:, new_version:)
+        title_object.log_info "Adding new version '#{new_version}' for subscribed title '#{title_object.title}'"
+
+        # get more details about this version from the JPAPI
+        patch_version_data = title_object.patch_versions(version: new_version).first
+        unless patch_version_data
+          msg = "Could not get patch version data from JPAPI for version '#{new_version}' of subscribed title '#{title_object.title}'. Cannot create new version in Xolo without this data. Aborting."
+          title_object.log_error msg, alert: true
+          return
+        end
+
+        title_object.log_debug "Got patch version data from JPAPI for version '#{new_version}': #{patch_version_data}"
+
+        # put the data into a hash for creating a new version object
+        vobj_data = {
+          publish_date: Time.parse(patch_version_data[:releaseDate]),
+          standalone: patch_version_data[:standalone],
+          min_os: patch_version_data[:minimumOperatingSystem],
+          reboot: patch_version_data[:rebootRequired],
+          killapps: []
+        }
+
+        # Killapps for subscribed titles? The API only shows app names without the .app, e.g.
+        # "killApps": [
+        #   {
+        #     "appName": "ChrislTestHelper"
+        #   },
+        #   {
+        #     "appName": "Chrisl Test"
+        #   }
+        # ]
+        # Since we don't manage them, we'll just record them in the data like this...
+        unless patch_version_data[:killApps].pix_empty?
+          patch_version_data[:killApps].each do |ka|
+            vobj_data[:killapps] << "#{ka[:appName]}.app;unknown.from.subscription"
+          end
+        end
+
+        # instantiate the version object
+        title_object.log_debug "Instantiating version via subscription '#{new_version}' of title '#{title_object.title}' (#{title_object.class}) with data: #{vobj_data}"
+
+        vobj = title_object.server_app_instance.instantiate_version(
+          title: title_object,
+          version: new_version,
+          **vobj_data
+        )
+
+        # create it in xolo
+        vobj.create
+
+        # tell someone
+        msg = "ACTION REQUIRED: New pilot version '#{new_version}' for subscribed title '#{title_object.title}' has been created in Xolo via subscription."
+
+        # if not autopkg enabled, we need to tell someone to upload a pkg for this new version
+        unless title_object.autopkg_enabled?
+          # update general alert msg
+          msg = "#{msg}\nPlease upload a .pkg for it ASAP using this command:\n   xadm edit-version #{title_object.title} #{new_version} --pkg-to-upload /path/to/installer.pkg"
+
+          # email to title contact
+          vobj.server_app_instance.send_email to: title_object.contact_email, subject: 'Need manual upload of xolo pkg', msg: msg
+        end # if title_object.autopkg_enabled?
+
+        # send general alert
+        vobj.log_info msg, alert: true
+      end
+
       # Attributes
       ######################
       ######################
 
       # The instance of Xolo::Server::App that instantiated this
-      # title object. This is how we access things that are available in routes
+      # version object. This is how we access things that are available in routes
       # and helpers, like the single Jamf and TEd
       # connections for this App instance.
       attr_accessor :server_app_instance
@@ -297,6 +371,9 @@ module Xolo
       #   one of :creating, :updating, :deleting
       attr_accessor :current_action
 
+      # @return [Boolean] is the pkg being processed now from an autopkg recipe?
+      attr_accessor :pkg_is_from_autopkg
+
       # Constructor
       ######################
       ######################
@@ -314,15 +391,15 @@ module Xolo
         @jamf_pkg_id ||= data_hash[:jamf_pkg_id]
 
         # and these can be generated now
-        @jamf_obj_name_pfx = "#{Xolo::Server::JAMF_OBJECT_NAME_PFX}#{title}-#{version}"
+        @jamf_obj_name_pfx = "#{jamf_obj_name_pfx_base}#{title}-#{version}"
 
         @jamf_pkg_name ||= @jamf_obj_name_pfx
 
-        @jamf_installed_group_name = "#{jamf_obj_name_pfx}#{JAMF_SMART_GROUP_NAME_INSTALLED_SFX}"
+        @jamf_installed_group_name = "#{jamf_obj_name_pfx}-#{JAMF_SMART_GROUP_NAME_INSTALLED_SFX}"
 
-        @jamf_auto_install_policy_name = "#{jamf_obj_name_pfx}#{JAMF_POLICY_NAME_AUTO_INSTALL_SFX}"
-        @jamf_manual_install_policy_name = "#{jamf_obj_name_pfx}#{JAMF_POLICY_NAME_MANUAL_INSTALL_SFX}"
-        @jamf_auto_reinstall_policy_name = "#{jamf_obj_name_pfx}#{JAMF_POLICY_NAME_AUTO_REINSTALL_SFX}"
+        @jamf_auto_install_policy_name = "#{jamf_obj_name_pfx}-#{JAMF_POLICY_NAME_AUTO_INSTALL_SFX}"
+        @jamf_manual_install_policy_name = "#{jamf_obj_name_pfx}-#{JAMF_POLICY_NAME_MANUAL_INSTALL_SFX}"
+        @jamf_auto_reinstall_policy_name = "#{jamf_obj_name_pfx}-#{JAMF_POLICY_NAME_AUTO_REINSTALL_SFX}"
 
         @jamf_patch_policy_name = @jamf_obj_name_pfx
 
@@ -391,7 +468,17 @@ module Xolo
       def pilot_groups_to_use
         return @pilot_groups_to_use if @pilot_groups_to_use
 
+        # any defined in the version override any in the title
         @pilot_groups_to_use = changes_for_update&.key?(:pilot_groups) ? changes_for_update[:pilot_groups][:new] : pilot_groups
+        return @pilot_groups_to_use unless @pilot_groups_to_use.empty?
+
+        # if none defined in the version, look in the title
+        @pilot_groups_to_use =
+          if title_object.changes_for_update&.key?(:pilot_groups)
+            title_object.changes_for_update[:pilot_groups][:new]
+          else
+            title_object.pilot_groups
+          end
       end
 
       # The scope excluded groups to use in policies and patch policies for all versions of
@@ -456,10 +543,12 @@ module Xolo
         # @session ||= {}
       end
 
+      # This can be manually set earlier in the request handling to use a non-standard
+      # admin username
       # @return [String]
       ###################
       def admin
-        session[:admin]
+        @admin ||= session[:admin]
       end
 
       # Append a message to the progress stream file,
@@ -472,8 +561,8 @@ module Xolo
       #
       # @return [void]
       ###################
-      def progress(msg, log: :debug)
-        server_app_instance.progress msg, log: log
+      def progress(msg, log: :debug, alert: false)
+        server_app_instance.progress msg, log: log, alert: alert
       end
 
       # This might have been set already if we were instantiated via our title
@@ -559,9 +648,7 @@ module Xolo
         progress 'Saving version data to Xolo server'
         save_local_data
 
-        create_patch_in_ted
-        enable_ted_patch
-        title_object.enable_ted_title
+        create_patch_in_ted unless subscribed?
 
         create_in_jamf
 
@@ -578,10 +665,68 @@ module Xolo
         log_change msg: 'Version Created'
 
         progress "Version '#{version}' of Title '#{title}' has been created in Xolo.", log: :info
+
+        # all done unless we need to get a pkg via autopkg
+        # pkg upload from xadm will happen in a separate process,
+        # so we don't want to do it here in the create method
+
+        # do we have an uploaded pkg?
+        if pkg_to_upload.to_s.start_with? '/'
+          progress "Pkg will be uploaded to xolo via xadm shortly, from path '#{pkg_to_upload}'", log: :info
+
+        # if we have an autopkg recipe and dir, get the .pkg and upload it to Jamf
+        elsif title_object.autopkg_enabled?
+          handle_autopkg_during_create
+
+        # otherwise tell someone we need a .pkg
+        else
+          msg = "No --pkg-to-upload given for version '#{version}' of title #{title}, and no autopkg recipe enabled. Please upload a pkg via xadm or enable autopkg for this title."
+
+          # no alert when subscribed because a better alert mesg is sent from add_version_via_subscription
+          subscribed? ? progress(msg, log: :warn) : progress(msg, log: :warn, alert: true)
+        end
       ensure
         unlock
       end
 
+      # Do autopkg stuff during creation
+      #
+      ############################
+      def handle_autopkg_during_create
+        return unless title_object.autopkg_enabled?
+
+        pkg_src = title_object.run_autopkg_recipe
+
+        if pkg_src.nil?
+          msg = 'AutoPkg recipe is enabled for this title, but no pkg was found after running the recipe. Please check the AutoPkg recipe and the server log for details.'
+          progress msg, log: :warn, alert: true
+          return
+        end
+
+        oldest_allowed = Time.now - 1200 # 20 minutes ago
+        if pkg_src.mtime < oldest_allowed
+          msg = "AutoPkg recipe is enabled for this title, and a pkg was found after running the recipe, but it was last modified at #{pkg_src.mtime}, which is more than 20 minutes ago. To avoid accidentally uploading an old pkg, the server will not upload this pkg. Please check the AutoPkg recipe and the server log for details."
+          progress msg, log: :warn, alert: true
+          return
+        end
+
+        # this lets future code know that the pkg we're working with came from autopkg
+        self.pkg_is_from_autopkg = true
+
+        # Upload the pkg to Jamf, and associate it with this version
+        server_app_instance.process_and_upload_autopkg_pkg(title, self, pkg_src)
+      end
+
+      # Is this version part of a subscribed title?
+      def subscribed?
+        title_object.subscribed?
+      end
+
+      # or a managed title?
+      def managed?
+        !subscribed?
+      end
+
       # Update a this version, updating to the
       # local filesystem, Jamf Pro, and the Title Editor as needed
       #
@@ -608,7 +753,6 @@ module Xolo
 
         # update ted before jamf
         update_patch_in_ted
-        enable_ted_patch
         update_version_in_jamf
         update_local_instance_values
         save_local_data
@@ -669,13 +813,16 @@ module Xolo
           progress "Fixing original upload date: #{new_date}, by: #{new_by}", log: :debug
           self.upload_date = new_date
           self.uploaded_by = new_by
-          save_local_data
+
         end
+        save_local_data
       ensure
         unlock
       end
 
       # Release this version, possibly rolling back from a previously newer version
+      # This should only be called by the title. The initial 'release' action starts in the title,
+      # and then calls this method on the version to do the version-specific release steps.
       #
       # @param rollback [Boolean] If true, this version is being released as a rollback
       #
@@ -689,6 +836,7 @@ module Xolo
         progress msg, log: :info
         pol = jamf_auto_install_policy
         set_policy_release_groups pol
+        pol.enable
         pol.save
 
         # set scope targets of patch policy to all (in patch pols, 'all' means 'all eligible')
@@ -825,15 +973,25 @@ module Xolo
       #   know the version is gone. Set this to false when the title itself
       #   is being deleted and calling this method.
       #
+      # @param deleting_title [Boolean] Is the title itself being deleted?
+      #
       # @return [void]
       ##########################
-      def delete(update_title: true)
+      def delete(update_title: true, deleting_title: false)
         lock
         @current_action = :deleting
 
-        delete_patch_from_ted
         delete_version_from_jamf
 
+        # NOTE: we no longer delete the patch from the Title Editor
+        # unless the whole title is being deleted, because
+        # patches may be needed for reporting purposes.
+        # When the title is deleted, the title's delete method
+        # will delete all patches for all versions.
+        # If other situations arise where we need to delete
+        # ted patches individually, set deleting_title to true.
+        delete_patch_from_ted if deleting_title && managed?
+
         # remove from the title's list of versions
         progress 'Deleting version from title data on the Xolo server', log: :debug
         title_object.remove_version(version) if update_title
@@ -860,14 +1018,16 @@ module Xolo
         raise Xolo::ServerError, 'Server is shutting down' if Xolo::Server.shutting_down?
 
         while locked?
-          log_debug "Waiting for update lock on Version '#{version}' of title '#{title}'..." if (Time.now.to_i % 5).zero?
+          if (Time.now.to_i % 5).zero?
+            log_debug "Method #{caller_locations.first.label} is waiting for update lock on Version '#{version}' of title '#{title}'..."
+          end
           sleep 0.33
         end
         Xolo::Server.object_locks[title] ||= { versions: {} }
 
         exp = Time.now + Xolo::Server::ObjectLocks::OBJECT_LOCK_LIMIT
         Xolo::Server.object_locks[title][:versions][version] = exp
-        log_debug "Locked version '#{version}' of title '#{title}' for updates until #{exp}"
+        log_debug "Locked version '#{version}' of title '#{title}' for updates until #{exp}, by method #{caller_locations.first.label}"
       end
 
       # Unlock this version for updates

data/lib/xolo/server.rb

@@ -27,6 +27,7 @@ require 'base64'
 require 'resolv'
 require 'shellwords'
 require 'net/smtp'
+require 'etc'
 
 # Gems
 ######
@@ -102,6 +103,11 @@ module Xolo
     ##############################
     ##############################
 
+    ################
+    def self.test_server?
+      Xolo::Server.config.test_server
+    end
+
     ################
     def self.start_time
       @start_time
@@ -194,6 +200,8 @@ require 'xolo/server/helpers/versions'
 require 'xolo/server/helpers/client_data'
 require 'xolo/server/helpers/file_transfers'
 require 'xolo/server/helpers/maintenance'
+require 'xolo/server/helpers/subscriptions'
+require 'xolo/server/helpers/autopkg'
 
 require 'xolo/server/configuration'