Produced by Araxis Merge on 10/2/2017 1:40:04 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | chef-repo.zip\chef-repo\project_cookbooks\activity_handler\templates\default | activity_handler.json.erb | Mon Aug 28 19:42:45 2017 UTC |
| 2 | chef-repo.zip\chef-repo\project_cookbooks\activity_handler\templates\default | activity_handler.json.erb | Mon Oct 2 12:38:19 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 162 |
| Changed | 1 | 2 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | { | |
| 2 | "//not ice": "Thi s file is automatica lly genera ted. Any e dits will be overwri tten.", | |
| 3 | "paral lelPublish ": 20, | |
| 4 | "beans talk": { | |
| 5 | "r epoUnivers al": { | |
| 6 | "priorit y": <%= @v xsync['vxs ync']['bea nstalk_pri ority'] %> , | |
| 7 | "delay": <%= @vxsy nc['vxsync ']['beanst alk_delay' ] %>, | |
| 8 | "ttr": < %= @vxsync ['vxsync'] ['beanstal k_ttr'] %> , | |
| 9 | "timeout ": <%= @vx sync['vxsy nc']['bean stalk_time out'] %>, | |
| 10 | "initMil lis": <%= @vxsync['v xsync']['b eanstalk_i nit_millis '] %>, | |
| 11 | "maxMill is": <%= @ vxsync['vx sync']['be anstalk_ma x_millis'] %>, | |
| 12 | "incMill is": <%= @ vxsync['vx sync']['be anstalk_in c_millis'] %> | |
| 13 | }, | |
| 14 | "r epoDefault s": { | |
| 15 | "host": "<%= @vxsy nc['ipaddr ess'] %>", | |
| 16 | "port": <%= @beans talk_confi g['port'] %>, | |
| 17 | "tubenam e": "<%= @ vxsync['vx sync']['be anstalk_pr ocesses'][ 'jobrepo'] ['config'] ['tube_nam e'] %>", | |
| 18 | "tubePre fix": "<%= @vxsync[' vxsync'][' beanstalk_ processes' ]['jobrepo ']['config ']['tube_p refix'] %> ", | |
| 19 | "jobType ForTube": <%= @vxsyn c['vxsync' ]['beansta lk_process es']['jobr epo']['con fig']['job _type'] %> | |
| 20 | }, | |
| 21 | "j obTypes": { | |
| 22 | "error-r equest": { | |
| 23 | "wor kerCount": <%= @node ['activity _handler'] ['beanstal k']['jobTy pes']['err or-request ']['worker _count'] % > | |
| 24 | }, | |
| 25 | "activit y-manageme nt-event": { | |
| 26 | "wor kerCount": <%= @node ['activity _handler'] ['beanstal k']['jobTy pes']['act ivity-mana gement-eve nt']['work er_count'] %> | |
| 27 | } | |
| 28 | }, | |
| 29 | "h andlerJobT ypes": [ | |
| 30 | "activit y-manageme nt-event" | |
| 31 | ] | |
| 32 | }, | |
| 33 | "jdsSe rver": { | |
| 34 | "b aseUrl": " http://<%= @jds['ipa ddress']%> :<%= @jds[ 'jds']['ca che_listen er_ports'] ['general' ]%>", | |
| 35 | "t imeout": 1 20000 | |
| 36 | }, | |
| 37 | "gener alPurposeJ dsServer": { | |
| 38 | "ba seUrl": "h ttp://<%= @pjds['ipa ddress']%> :<%= @pjds ['jds']['c ache_liste ner_ports' ]['general ']%>", | |
| 39 | "ur lLengthLim it": 120 | |
| 40 | }, | |
| 41 | "vista Sites": { | |
| 42 | <% @vista_si tes.each_w ith_index do |site, index| %> | |
| 43 | "< %= site['v ista']['si te_id']%>" : { | |
| 44 | "divisio n": <%= si te['vista' ]['divisio n'].to_jso n %>, | |
| 45 | "host": "<%= site[ 'ipaddress ']%>", | |
| 46 | "localIP": " IP ", | |
| 47 | "localAd dress": "l ocalhost", | |
| 48 | "port": <%= site[' vista']['r pc_port']% >, | |
| 49 | "product ion": <%= site['vist a']['produ ction']%>, | |
| 50 | "accessC ode": "<%= site['vis ta']['acce ss_code']% >", | |
| 51 | "verifyC ode": "<%= site['vis ta']['veri fy_code']% >", | |
| 52 | "infoBut tonOid": " 1.3.6.1.4. 1.3768", | |
| 53 | "abbrevi ation": "< %= site['v ista']['ab breviation ']%>" | |
| 54 | }< %= ',' unl ess index == @vista_ sites.size - 1 %> | |
| 55 | <% end %> | |
| 56 | }, | |
| 57 | <% if !@oracle.n il? %> | |
| 58 | "oracl edb": { | |
| 59 | "a ctivityDat abase": { | |
| 60 | "user": "<%= @orac le_ehmpuse r_username %>", | |
| 61 | "passwor d": "<%= @ oracle_ehm puser_pass word %>", | |
| 62 | "connect String": " <%= @oracl e[:ipaddre ss] %>:<%= @oracle[: ehmp_oracl e][:oracle _config][: port] %>/< %= @oracle [:ehmp_ora cle][:orac le_sid] %> ", | |
| 63 | "poolMin ": <%= @no de['activi ty_handler ']['oracle _connectio n_pool'][' minimum'] %>, | |
| 64 | "poolMax ": <%= @no de['activi ty_handler ']['oracle _connectio n_pool'][' maximum'] %> | |
| 65 | } | |
| 66 | }, | |
| 67 | <% end %> | |
| 68 | <% if !@jbpm.nil ? %> | |
| 69 | "jbpm" : { | |
| 70 | "b aseUrl": " http://<%= @jbpm['ip address']% >:8080", | |
| 71 | "a piPath": " /business- central/re st", | |
| 72 | "a dminUser": { | |
| 73 | "usernam e": "<%= @ jbpm['jbpm ']['instal l']['admin _user'] %> ", | |
| 74 | "passwor d": "<%= @ jbpm_admin _password %>" | |
| 75 | }, | |
| 76 | "h ealthcheck Endpoint": "/deploym ent" | |
| 77 | }, | |
| 78 | <% end %> | |
| 79 | "activ ityManagem entJobRetr yLimit": < %= @node[' activity_h andler'][' activityMa nagementJo bRetryLimi t'] %>, | |
| 80 | "defau ltWorkerCo unt": <%= @node['act ivity_hand ler']['wor ker_count' ] %>, | |
| 81 | "log-l evel": "<% = @node['a ctivity_ha ndler']['l og_level'] ['activity _handler'] %>" | |
| 82 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.