Fixes bug where init script checks for existence of the wrong file on…

… 10.4.
Esri · Dec 1, 2017 · cff207a · cff207a
1 parent 378a438
commit cff207a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/cookbooks/arcgis-enterprise/providers/server.rb b/cookbooks/arcgis-enterprise/providers/server.rb
@@ -665,7 +665,14 @@
     if node['init_package'] == 'init'
       arcgisserver_path = '/etc/init.d/arcgisserver'
       service_file = 'arcgisserver.erb'
-      template_variables = ({ :agshome => agshome })
+
+      if node['arcgis']['version'].start_with? '10.4'
+        properties_file = 'arcgis-server-framework.properties'
+      else
+        properties_file = 'arcgis-framework.properties'
+      end
+
+      template_variables = ({ :agshome => agshome, :agsproperties => properties_file })
     # Systemd
     else node['init_package'] == 'systemd'
       arcgisserver_path = '/etc/systemd/system/arcgisserver.service'

diff --git a/cookbooks/arcgis-enterprise/templates/default/arcgisserver.erb b/cookbooks/arcgis-enterprise/templates/default/arcgisserver.erb
@@ -10,7 +10,7 @@
 ### END INIT INFO
 
 invoker=`id | cut -f 2 -d '(' | cut -f 1 -d ')'`
-agsfilecheck=framework/etc/arcgis-framework.properties
+agsfilecheck=framework/etc/<%=@agsproperties%>
 
 rwd=`dirname $0`/../../..
 if [ -L "$0" ]; then