xolo-server 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52595d7268e2f989402fd60e3c8c992b993a1342d4a5f4436953a025493d2409
-  data.tar.gz: 39ecea967112210302c3242d7c0f9f53da34ffa8a803c71cf4edced97b26113a
+  metadata.gz: 6b12ee4495ec1ef8ad6ff15963a47b8c5c960fbfc66c447355d9205a821945d5
+  data.tar.gz: b5223966d5f2d32298cbd74fceb3bc9bd86377249f05cf7ff0cdcee7d892a0ef
 SHA512:
-  metadata.gz: be740aa47014789519e5d167bda8fa19d517331945c6e5520403e59643620cf660a09f142031e65e385a254b427362b9e78c459dfde20b1ecf3c0835e6fc030b
-  data.tar.gz: 7c4792d23e49b5d486c3f24aab9b51d35f510d303597d5d1ce84b7eb5dfb4723a5bf07b357d1429b6c99c0d85737df75c04b3cd6f70967277088faa40db76145
+  metadata.gz: 6891dc7666891af24efb6c3b2842154dedc0fb94652203ac7cdbce21b2f5cbf38e69dbbd54630f7c5c4f5dabdc3b717ade26c26ce1fcfbb94fc318669a2704c7
+  data.tar.gz: faf5eb9e5a6ce4e63989070bece99e9916fe44fe14a40d6e25a04a16ddeabd5d45641cf6cce380827fa0d06901bccfc345a99ea5983b2f2509223eaf816467b6

data/lib/xolo/core/base_classes/title.rb

@@ -759,7 +759,7 @@ module Xolo
 
               By default this is false, Patch Policies for versions will be set to 'Install Automatically'.
 
-              If set to true, Patch Policies for versions will be set to 'Make Available in Self Service' and the version will appear in the Updates section when available. The update won't happen until the user clicks a button, or the 7-day deadline passes. Notifications will be displayed daily.
+              If set to true, Patch Policies for versions will be set to 'Make Available in Self Service' and the version will appear in the Updates section when available. The update won't happen until the user clicks a button, or the 7-day deadline passes. Notifications will be displayed daily. For these titles, 'xolo update' will not apply the update, but 'xolo install <title>' will update/install the current release.
 
               When installing automatically, or the deadline passes, the update will happen at the checkin after the next recon. If the version has any KillApps, the user will be prompted to quit them, with a grace period of 15 minutes before the update starts.
 

data/lib/xolo/core/version.rb

@@ -12,7 +12,7 @@ module Xolo
 
     module Version
 
-      VERSION = '2.2.2'.freeze
+      VERSION = '2.2.3'.freeze
 
     end
 

data/lib/xolo/server/helpers/client_data.rb

@@ -160,15 +160,24 @@ module Xolo
         #
         # This process is protected by a mutex to prevent multiple updates at the same time.
         #
+        # @param post_maint [Boolean] Are we being called at the end of the run_maint method?
+        #
         # @return [void]
         #####################
-        def update_client_data
+        def update_client_data(post_maint: false)
           # don't do anything if we are in developer/test mode
           if Xolo::Server.config.developer_mode?
             log_debug 'Jamf: Skipping client-data update in developer mode'
             return
           end
 
+          # don't do anything if maintenance is running,
+          # the main process will call this method once at the end
+          if Xolo::Server::Helpers::Maintenance.maint_running? && !post_maint
+            log_debug 'Jamf: Skipping client-data update while maintenance is running'
+            return
+          end
+
           log_info 'Jamf: Updating client-data package'
 
           # TODO: Use Concurrent Ruby instead of Mutex

data/lib/xolo/server/helpers/maintenance.rb

@@ -123,6 +123,12 @@ module Xolo
           @last_maint = time
         end
 
+        # @return [Time] Is maintenance running right now? true if the mutex is locked
+        ######################################
+        def self.maint_running?
+          maint_mutex.locked?
+        end
+
         # post to the server to start the maint process
         # This is done so that the maint can run in the context of a request,
         # having access to Title and Version instantiation.
@@ -136,12 +142,14 @@ module Xolo
             return
           end
 
+          now = Time.now
+
           # only run the maintenance if it's during the MAINT_HOUR
           # and the last one was more than MAINT_MAX_FREQ_SECS ago
           if force
             Xolo::Server.logger.info 'Maint: Starting now due to force'
 
-          elsif Time.now.hour == MAINT_HOUR && (Time.now - last_maint) > MAINT_MAX_FREQ_SECS
+          elsif now.hour == MAINT_HOUR && (now - last_maint) > MAINT_MAX_FREQ_SECS
             Xolo::Server.logger.info 'Maint: Starting nightly run now'
 
           else
@@ -179,19 +187,25 @@ module Xolo
             return
           end
           mutex.lock
+
           log_info 'Maint: starting'
 
           # instantiate all the titles once now, rather than in all the task methods
-          title_objects_for_maint = Xolo::Server::Title.all_titles.map { |t| instantiate_title t }
+          title_objects_for_maint = all_title_objects refresh: true
 
           # add new maintenance tasks/methods here
+          ######
           accept_title_editor_eas title_objects_for_maint
           auto_release_versions title_objects_for_maint
           cleanup_versions title_objects_for_maint
           notify_admins_of_unreleased_pilots title_objects_for_maint
 
+          # make note of the time.
           Xolo::Server::Helpers::Maintenance.last_maint = Time.now
           log_info 'Maint: complete'
+
+          log_debug 'Maint: running update_client_data after all tasks'
+          update_client_data post_maint: true
         ensure
           mutex&.unlock
         end
@@ -279,6 +293,9 @@ module Xolo
             title_obj.release vobj_to_release.version
 
             log_info "Maint: Auto-released version '#{vobj_to_release.version}' of '#{title}' which came out #{vobj_to_release.creation_date}", alert: true
+
+            # pause for server to catch up
+            sleep 60
           end # each title
 
           log_debug 'Maint: Done auto-releasing'

data/lib/xolo/server/mixins/title_jamf_access.rb

@@ -1716,7 +1716,9 @@ module Xolo
         def add_title_to_self_service(pol = nil)
           pol ||= jamf_manual_install_released_policy
 
-          unless pol.in_self_service?
+          if pol.in_self_service?
+            progress "Jamf: Manual Install Policy '#{pol.name}' already in Self Service."
+          else
             msg = "Jamf: Adding Manual Install Policy '#{pol.name}' to Self Service."
             progress msg, log: :info
             pol.add_to_self_service

data/lib/xolo/server/mixins/version_jamf_access.rb

@@ -939,14 +939,22 @@ module Xolo
           # explicit false
           ppol.patch_unknown = patch_unknown ? true : false
 
+          # Patch Pol. Scope Targets:
           # when first creating a patch policy, its status is always
           # 'pilot' so the scope targets are the pilot groups, if any.
+          #
           # When the version is released, the patch policy will be
-          # rescoped to all targets (limited by eligibility)
-          if pilot?
+          # rescoped to all computers (limited by eligibility)
+          #
+          # Any other state should have no scope targets
+          if pilot? || creating?
             set_policy_pilot_groups ppol
-          else
+          elsif released? || releasing?
+            log_debug "Setting Patch Policy Scope for Version '#{version}' of Title '#{title}' to all comptuers, for release"
             ppol.scope.set_all_targets
+          else
+            log_debug "Setting Patch Policy Scope for Version '#{version}' of Title '#{title}' to no targets: not in pilot or released"
+            ppol.scope.set_targets :computer_groups, []
           end
 
           # exclusions are for always
@@ -1016,9 +1024,11 @@ module Xolo
             ppol.self_service_reminder_frequency = PATCH_POL_SSVC_REMINDER_FREQ_HRS
             ppol.deadline = PATCH_POL_SSVC_DEADLINE_DAYS
 
-            return unless title_object.ssvc_icon_id
+            icon_id =
+              title_object.ssvc_icon_id || title_object.jamf_manual_install_released_policy.self_service_icon.id
+            return unless icon_id
 
-            set_patch_policy_ssvc_icon ppol, title_object.ssvc_icon_id
+            set_patch_policy_ssvc_icon ppol, icon_id
 
           # Automatic deployment
           else

data/lib/xolo/server/title.rb

@@ -1130,6 +1130,7 @@ module Xolo
         repair_ted_title
         set_subscribed_display_name_and_publisher
         repair_jamf_title_objects
+        self.ssvc_icon_id = jamf_manual_install_released_policy.self_service_icon.id
         save_local_data
         return unless repair_versions
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xolo-server
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Chris Lasell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-15 00:00:00.000000000 Z
+date: 2026-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday