Produced by Araxis Merge on 10/2/2017 1:40:11 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\third_party_cookbooks\oracle-xe | Vagrantfile | Wed Jan 6 20:08:55 2016 UTC |
| 2 | chef-repo.zip\chef-repo\third_party_cookbooks\oracle-xe | Vagrantfile | Mon Oct 2 12:49:05 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 2 | 178 |
| 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 | # -*- mode : ruby -*- | |
| 2 | # vi: set ft=ruby : | |
| 3 | ||
| 4 | Vagrant.co nfigure("2 ") do |con fig| | |
| 5 | ||
| 6 | config.v bguest.aut o_update = false | |
| 7 | config.v bguest.no_ remote = t rue | |
| 8 | ||
| 9 | # All Va grant conf iguration is done he re. The mo st common configurat ion | |
| 10 | # option s are docu mented and commented below. Fo r a comple te referen ce, | |
| 11 | # please see the o nline docu mentation at vagrant up.com. | |
| 12 | ||
| 13 | config.v m.hostname = "oracle -xe-berksh elf" | |
| 14 | ||
| 15 | # Every Vagrant vi rtual envi ronment re quires a b ox to buil d off of. | |
| 16 | config.v m.box = "c entos-6.4" | |
| 17 | ||
| 18 | # The ur l from whe re the 'co nfig.vm.bo x' box wil l be fetch ed if it | |
| 19 | # doesn' t already exist on t he user's system. | |
| 20 | config.v m.box_url = "https:/ /dl.dropbo x.com/u/47 541301/vag rantboxes/ centos-6.4 .box" | |
| 21 | ||
| 22 | # Assign this VM t o a host-o nly networ k IP, allo wing you t o access i t | |
| 23 | # via th e IP. Host -only netw orks can t alk to the host mach ine as wel l as | |
| 24 | # any ot her machin es on the same netwo rk, but ca nnot be ac cessed (th rough this | |
| 25 | # networ k interfac e) by any external n etworks. | |
| 26 | # config .vm.networ k :private _network, ip: "33.33 .33.10" | |
| 27 | ||
| 28 | # Create a public network, w hich gener ally match ed to brid ged networ k. | |
| 29 | # Bridge d networks make the machine ap pear as an other phys ical devic e on | |
| 30 | # your n etwork. | |
| 31 | ||
| 32 | # config .vm.networ k :public_ network | |
| 33 | ||
| 34 | # Create a forward ed port ma pping whic h allows a ccess to a specific port | |
| 35 | # within the machi ne from a port on th e host mac hine. In t he example below, | |
| 36 | # access ing "local host:8080" will acce ss port 80 on the gu est machin e. | |
| 37 | ||
| 38 | # Share an additio nal folder to the gu est VM. Th e first ar gument is | |
| 39 | # the pa th on the host to th e actual f older. The second ar gument is | |
| 40 | # the pa th on the guest to m ount the f older. And the optio nal third | |
| 41 | # argume nt is a se t of non-r equired op tions. | |
| 42 | # config .vm.synced _folder ". ./data", " /vagrant_d ata" | |
| 43 | ||
| 44 | # Provid er-specifi c configur ation so y ou can fin e-tune var ious | |
| 45 | # backin g provider s for Vagr ant. These expose pr ovider-spe cific opti ons. | |
| 46 | # Exampl e for Virt ualBox: | |
| 47 | # | |
| 48 | # config .vm.provid er :virtua lbox do |v b| | |
| 49 | # # Do n't boot w ith headle ss mode | |
| 50 | # vb.g ui = true | |
| 51 | # | |
| 52 | # # Us e VBoxMana ge to cust omize the VM. For ex ample to c hange memo ry: | |
| 53 | # vb.c ustomize [ "modifyvm" , :id, "-- memory", " 1024"] | |
| 54 | # end | |
| 55 | # | |
| 56 | # View t he documen tation for the provi der you're using for more | |
| 57 | # inform ation on a vailable o ptions. | |
| 58 | ||
| 59 | config.s sh.max_tri es = 40 | |
| 60 | config.s sh.timeout = 120 | |
| 61 | ||
| 62 | # The pa th to the Berksfile to use wit h Vagrant Berkshelf | |
| 63 | # config .berkshelf .berksfile _path = ". /Berksfile " | |
| 64 | ||
| 65 | # Enabli ng the Ber kshelf plu gin. To en able this globally, add this c onfigurati on | |
| 66 | # option to your ~ /.vagrant. d/Vagrantf ile file | |
| 67 | config.b erkshelf.e nabled = t rue | |
| 68 | ||
| 69 | # An arr ay of symb ols repres enting gro ups of coo kbook desc ribed in t he Vagrant file | |
| 70 | # to exc lusively i nstall and copy to V agrant's s helf. | |
| 71 | # config .berkshelf .only = [] | |
| 72 | ||
| 73 | # An arr ay of symb ols repres enting gro ups of coo kbook desc ribed in t he Vagrant file | |
| 74 | # to ski p installi ng and cop ying to Va grant's sh elf. | |
| 75 | # config .berkshelf .except = [] | |
| 76 | ||
| 77 | config.v m.provisio n :chef_so lo do |che f| | |
| 78 | chef.l og_level = :debug | |
| 79 | chef.j son = { | |
| 80 | 'ora cle-xe' => { | |
| 81 | 'url' => ' http:// IP /~juliandu nn/binarie s/oracle-x e-11.2.0-1 .0.x86_64. rpm' | |
| 82 | } | |
| 83 | } | |
| 84 | ||
| 85 | chef.r un_list = [ | |
| 86 | "r ecipe[orac le-xe]" | |
| 87 | ] | |
| 88 | ||
| 89 | end | |
| 90 | end |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.