Produced by Araxis Merge on 10/12/2018 4:04:52 PM Eastern 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 | Vetlink 2.0.zip\Vetlink 2.0\vetlink-web.zip\vetlink-web\vetlink\grunt | contrib-connect.js | Thu Nov 2 15:14:16 2017 UTC |
| 2 | Vetlink 2.0.zip\Vetlink 2.0\vetlink-web.zip\vetlink-web\vetlink\grunt | contrib-connect.js | Thu Oct 11 20:32:13 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 7 | 238 |
| Changed | 6 | 12 |
| 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 | module.exp orts = fun ction(grun t) { | |
| 2 | ||
| 3 | va r serveSta tic = requ ire('serve -static'); | |
| 4 | va r serveInd ex = requi re('serve- index'); | |
| 5 | gr unt.config ('connect' , { | |
| 6 | opti ons : { | |
| 7 | port : 9000 , | |
| 8 | // Cha nge this t o '0.0.0.0 ' to acces s the serv er from ou tside. | |
| 9 | hostname : ' IP ', | |
| 10 | livere load: 3572 9 | |
| 11 | }, | |
| 12 | prox ies: [{ | |
| 13 | context: '/VetLink Services', // the co ntext of t he data se rvice | |
| 14 | host: ' IP ', // wher ever the d ata servic e is runni ng | |
| 15 | port: 80 80 // the port that the data s ervice is running on | |
| 16 | }, | |
| 17 | { | |
| 18 | context: ' /launchpad ', // the context of the data service | |
| 19 | host: ' IP ', // wher ever the d ata servic e is runni ng | |
| 20 | port: 8080 // the po rt that th e data ser vice is ru nning on | |
| 21 | }, | |
| 22 | { | |
| 23 | context: ' /common-re st-service s', // the context o f the data service | |
| 24 | host: ' IP ', // wher ever the d ata servic e is runni ng | |
| 25 | port: 8080 // the po rt that th e data ser vice is ru nning on | |
| 26 | }, | |
| 27 | { | |
| 28 | cont ext: '/Mob ileHealthP latform', // the con text of th e data ser vice | |
| 29 | host: ' IP ', // wher ever the d ata servic e is runni ng | |
| 30 | port : 8080 // the port t hat the da ta service is runnin g on | |
| 31 | }, | |
| 32 | { | |
| 33 | cont ext: '/Aut horization Services', // the co ntext of t he data se rvice | |
| 34 | host: ' IP ', // wher ever the d ata servic e is runni ng | |
| 35 | port : 8080 // the port t hat the da ta service is runnin g on | |
| 36 | }], | |
| 37 | live reload: { | |
| 38 | option s: { | |
| 39 | open: tr ue, | |
| 40 | base: [ | |
| 41 | '.tmp', | |
| 42 | '<%= yeoma n.app %>' | |
| 43 | ] | |
| 44 | , | |
| 45 | midd leware: fu nction (co nnect, opt ions) { | |
| 46 | if (!A rray.isArr ay(options .base)) { | |
| 47 | op tions.base = [option s.base]; | |
| 48 | } | |
| 49 | ||
| 50 | // Set up the pro xy | |
| 51 | var mi ddlewares = [require ('grunt-co nnect-prox y/lib/util s').proxyR equest]; | |
| 52 | ||
| 53 | // Ser ve static files. | |
| 54 | option s.base.for Each(funct ion(base) { | |
| 55 | mi ddlewares. push(serve Static(bas e)); | |
| 56 | }); | |
| 57 | ||
| 58 | // Mak e director y browse-a ble. | |
| 59 | var di rectory = options.di rectory || options.b ase[option s.base.len gth - 1]; | |
| 60 | middle wares.push (serveInde x(director y)); | |
| 61 | ||
| 62 | return middlewar es; | |
| 63 | } | |
| 64 | } | |
| 65 | }, | |
| 66 | test : { | |
| 67 | option s: { | |
| 68 | port: 90 01, | |
| 69 | base: [ | |
| 70 | '.tmp', | |
| 71 | 'test', | |
| 72 | '<%= yeoma n.app %>' | |
| 73 | ], | |
| 74 | midd leware: fu nction (co nnect, opt ions) { | |
| 75 | if (!Array .isArray(o ptions.bas e)) { | |
| 76 | option s.base = [ options.ba se]; | |
| 77 | } | |
| 78 | ||
| 79 | // Setup t he proxy | |
| 80 | var middle wares = [r equire('gr unt-connec t-proxy/li b/utils'). proxyReque st]; | |
| 81 | ||
| 82 | // Serve s tatic file s. | |
| 83 | options.ba se.forEach (function( base) { | |
| 84 | middle wares.push (serveStat ic(base)); | |
| 85 | }); | |
| 86 | ||
| 87 | // Make di rectory br owse-able. | |
| 88 | var direct ory = opti ons.direct ory || opt ions.base[ options.ba se.length - 1]; | |
| 89 | middleware s.push(ser veIndex(di rectory)); | |
| 90 | ||
| 91 | return mid dlewares; | |
| 92 | } | |
| 93 | } | |
| 94 | }, | |
| 95 | dist : { | |
| 96 | option s: { | |
| 97 | base: '< %= yeoman. dist %>', | |
| 98 | open : true, | |
| 99 | midd leware: fu nction (co nnect, opt ions) { | |
| 100 | if (!Array .isArray(o ptions.bas e)) { | |
| 101 | option s.base = [ options.ba se]; | |
| 102 | } | |
| 103 | ||
| 104 | // Setup t he proxy | |
| 105 | var middle wares = [r equire('gr unt-connec t-proxy/li b/utils'). proxyReque st]; | |
| 106 | ||
| 107 | // Serve s tatic file s. | |
| 108 | options.ba se.forEach (function( base) { | |
| 109 | middle wares.push (serveStat ic(base)); | |
| 110 | }); | |
| 111 | ||
| 112 | // Make di rectory br owse-able. | |
| 113 | var direct ory = opti ons.direct ory || opt ions.base[ options.ba se.length - 1]; | |
| 114 | middleware s.push(ser veIndex(di rectory)); | |
| 115 | ||
| 116 | return mid dlewares; | |
| 117 | } | |
| 118 | } | |
| 119 | } | |
| 120 | }) ; | |
| 121 | ||
| 122 | gr unt.loadNp mTasks('gr unt-contri b-connect' ); | |
| 123 | gr unt.loadNp mTasks('gr unt-connec t-proxy'); | |
| 124 | ||
| 125 | }; |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.