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\newrelic\templates\default\agent\php | newrelic.cfg.erb | Fri Jul 1 19:03:51 2016 UTC |
| 2 | chef-repo.zip\chef-repo\third_party_cookbooks\newrelic\templates\default\agent\php | newrelic.cfg.erb | Mon Oct 2 15:39:09 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 4 | 426 |
| Changed | 3 | 8 |
| 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 | # Generate d by Chef | |
| 3 | ########## ######### | |
| 4 | ||
| 5 | # | |
| 6 | # This is a configur ation temp late for t he New Rel ic daemon - a commun ications | |
| 7 | # proxy be tween New Relic agen ts (such a s the PHP agent) and the New R elic | |
| 8 | # data col lectors. T his config uration fi le is requ ired *ONLY * if you n eed or | |
| 9 | # want to start the New Relic daemon at system boo t time usi ng init. I n order | |
| 10 | # to do so you must execute th e followin g commands (as root) : | |
| 11 | # | |
| 12 | # For Cent OS and Red Hat system s: | |
| 13 | # /sbin /chkconfig newrelic- daemon on | |
| 14 | # | |
| 15 | # For Ubun tu and Deb ian system s: | |
| 16 | # /usr/ sbin/updat e-rc.d new relic-daem on default s 90 10 | |
| 17 | # /usr/ sbin/updat e-rc.d new relic-daem on enable | |
| 18 | # | |
| 19 | # For othe r systems please con sult your documentat ion on how to enable and | |
| 20 | # disable services. | |
| 21 | # | |
| 22 | # For all systems: | |
| 23 | # /etc/ init.d/new relic-daem on start | |
| 24 | # | |
| 25 | # The star tup script s will onl y start th e daemon i f there is a valid d aemon | |
| 26 | # configur ation file in place. This file is, by de fault: | |
| 27 | # | |
| 28 | # /etc/ newrelic/n ewrelic.cf g | |
| 29 | # | |
| 30 | # If that file does not exist, you can c opy this t emplate fi le to that | |
| 31 | # location and edit it to suit your syst em needs. | |
| 32 | # | |
| 33 | # By defau lt the dae mon is not started a t system b oot time, and does n ot use | |
| 34 | # the /etc /newrelic/ newrelic.c fg file. R ather, the daemon is started b y the | |
| 35 | # agent au tomaticall y on start up and is configured by the ag ent (for e xample | |
| 36 | # when usi ng the PHP agent the daemon pa rameters a re set in the global INI | |
| 37 | # file and all begin with 'new relic.daem on'). | |
| 38 | # | |
| 39 | # There ar e certain circumstan ces under which you may want t he daemon to be | |
| 40 | # started at boot ti me rather than by th e agent. I f you use a chroot j ail for | |
| 41 | # running the agent in, if you have mult iple web s ervers or FastCGI pr ocess | |
| 42 | # managers , or if yo u use PHP on the com mand line a lot for batch proc essing | |
| 43 | # then you may want to start t he daemon once at sy stem boot rather tha n having | |
| 44 | # the agen t start it . | |
| 45 | # | |
| 46 | # Below ar e the vari ous option s you can change tha t affect t he daemon. Each | |
| 47 | # one is e xplained i n detail a long with it's defau lt value. | |
| 48 | # | |
| 49 | ||
| 50 | # | |
| 51 | # Setting: pidfile | |
| 52 | # Type : string | |
| 53 | # Purpose: Sets the name of th e file tha t the daem on writes its proces s ID | |
| 54 | # (PID) to. This is u sed by the startup a nd shutdow n script t o know | |
| 55 | # which pro cess to mo nitor or k ill. | |
| 56 | # Default: OS-depend ent. Uses a filename of newrel ic-daemon. pid in the first | |
| 57 | # directory from the list /var/ run or /va r/pid that is found. | |
| 58 | <% if @res ource.daem on_pidfile .nil? %> | |
| 59 | #pidfile=/ var/run/ne wrelic-dae mon.pid | |
| 60 | <% else %> | |
| 61 | pidfile=<% = @resourc e.daemon_p idfile %> | |
| 62 | <% end %> | |
| 63 | ||
| 64 | # | |
| 65 | # Setting: logfile | |
| 66 | # Type : string | |
| 67 | # Purpose: Sets the name of th e file to record log messages in. If thi s file | |
| 68 | # does not exist it i s created. If it can not be cre ated the d aemon | |
| 69 | # will not start up. The amount of inform ation sent to this f ile is | |
| 70 | # controlle d by the l oglevel se ttings, de fined belo w. | |
| 71 | # Default: /var/log/ newrelic/n ewrelic-da emon.log | |
| 72 | <% if @res ource.daem on_logfile .nil? %> | |
| 73 | #logfile=/ var/log/ne wrelic/new relic-daem on.log | |
| 74 | <% else %> | |
| 75 | logfile=<% = @resourc e.daemon_l ogfile %> | |
| 76 | <% end %> | |
| 77 | ||
| 78 | # | |
| 79 | # Setting: loglevel | |
| 80 | # Type : string | |
| 81 | # Purpose: Sets the level of d etail of l og message s sent to the log fi le. This | |
| 82 | # variable can contro l the log level for different subsystem at | |
| 83 | # different levels, a lthough su ch custom usage shou ld only be done at | |
| 84 | # the reque st of New Relic tech nical supp ort. The s implest se tting is | |
| 85 | # to use on e of the f ollowing k eywords, i n increasi ng order o f detail: | |
| 86 | # error - o nly error messages | |
| 87 | # warning - only warn ing and er ror messag es | |
| 88 | # info - on ly minimal startup a nd shutdow n info | |
| 89 | # verbose - slightly more verbo se than in fo, not co mmonly use d | |
| 90 | # debug - v ery verbos e, include s messages only rele vant to su pport | |
| 91 | # verbosede bug - extr emely verb ose, creat es massive log files | |
| 92 | # Default: info | |
| 93 | <% if @res ource.daem on_logleve l.nil? %> | |
| 94 | #loglevel= info | |
| 95 | <% else %> | |
| 96 | loglevel=< %= @resour ce.daemon_ loglevel % > | |
| 97 | <% end %> | |
| 98 | ||
| 99 | # | |
| 100 | # Setting: port | |
| 101 | # Type : Integer ( 1-65534) | |
| 102 | # Purpose: Sets the TCP port o n which th e daemon w ill listen for conne ctions | |
| 103 | # from agen ts (agents in this c ase includ es Apache / php-fpm worker | |
| 104 | # processes , the comm and line, or any oth er agent s ource). In order | |
| 105 | # to use a port in th e range 1- 1023, the daemon mus t be start ed by | |
| 106 | # the super -user. Thi s is a fun damental O S limitati on and not one | |
| 107 | # imposed b y the daem on itself. | |
| 108 | # Default: PORT | |
| 109 | <% if @res ource.daem on_port.ni l? %> | |
| 110 | #port= PORT | |
| 111 | <% else %> | |
| 112 | port=<%= @ resource.d aemon_port %> | |
| 113 | <% end %> | |
| 114 | ||
| 115 | # | |
| 116 | # Setting: ssl | |
| 117 | # Type : boolean | |
| 118 | # Purpose: If you pr efer the d aemon to u se the sec ure HTTP ( https) pro tocol | |
| 119 | # when comm unicating with the N ew Relic c ollector s ervers, se t this | |
| 120 | # to true. Please not e that in order for this to wo rk the dae mon must | |
| 121 | # be able t o find a C ertificate Authority (CA) list . On start up the | |
| 122 | # daemon wi ll attempt to find s uch a list in the us ual places , but | |
| 123 | # you may n eed to use the ssl_c a_bundle o r ssl_ca_p ath variab les | |
| 124 | # below. | |
| 125 | # Default: false | |
| 126 | <% if @res ource.daem on_ssl.nil ? %> | |
| 127 | #ssl=false | |
| 128 | <% else %> | |
| 129 | ssl=<%= @r esource.da emon_ssl % > | |
| 130 | <% end %> | |
| 131 | ||
| 132 | # | |
| 133 | # Setting: proxy | |
| 134 | # Type : string | |
| 135 | # Purpose: Some netw orks are c onfigured to require the use o f an egres s proxy | |
| 136 | # server in order to communicat e with the outside w orld. Sinc e the | |
| 137 | # daemon ne eds to com municate w ith the Ne w Relic da ta collect ion | |
| 138 | # servers y ou may nee d to instr uct it to use a prox y server. Your | |
| 139 | # system or network a dministrat or should be able to provide y ou with | |
| 140 | # the detai ls. | |
| 141 | # This stri ng is in t he form [u ser[:passw ord]]@host name[:port ] with | |
| 142 | # the user, password and port f ields bein g optional . Some exa mples: | |
| 143 | # myusername :secret@ IP : PORT | |
| 144 | # someuser@p roxy.mydom ain.com: PORT | |
| 145 | # proxy.myd omain.com | |
| 146 | # Default: none | |
| 147 | <% if @res ource.daem on_proxy.n il? %> | |
| 148 | #proxy= | |
| 149 | <% else %> | |
| 150 | proxy=<%= @resource. daemon_pro xy %> | |
| 151 | <% end %> | |
| 152 | ||
| 153 | # | |
| 154 | # Setting: ssl_ca_bu ndle | |
| 155 | # Type : string | |
| 156 | # Purpose: If you ha ve the "ss l" option above enab led, and t he daemon cannot | |
| 157 | # find a su itable Cer tificate A uthority ( CA) list, this is on e of the | |
| 158 | # options y ou can use to point it to the CA list to use. If y our SSL | |
| 159 | # installat ion uses a "bundle" - i.e. a s ingle file which con tains a | |
| 160 | # list of C A's - then this opti on should point to t hat bundle file. | |
| 161 | # Default: Looks for one of tw o files: / etc/pki/tl s/certs/ca -bundle.cr t or | |
| 162 | # /etc/ssl/ certs/ca-c ertificate s.crt. | |
| 163 | # | |
| 164 | <% if @res ource.daem on_ssl_ca_ bundle.nil ? %> | |
| 165 | #ssl_ca_bu ndle= | |
| 166 | <% else %> | |
| 167 | ssl_ca_bun dle=<%= @r esource.da emon_ssl_c a_bundle % > | |
| 168 | <% end %> | |
| 169 | ||
| 170 | # | |
| 171 | # Setting: ssl_ca_pa th | |
| 172 | # Type : string | |
| 173 | # Purpose: See ssl_c a_bundle a bove. This option sh ould be us ed if your SSL | |
| 174 | # installat ion uses a sub-direc tory with a list of CA certifi cates. | |
| 175 | # Set this variable t o point to that dire ctory. | |
| 176 | # Default: /etc/ssl/ certs | |
| 177 | <% if @res ource.daem on_ssl_ca_ path.nil? %> | |
| 178 | #ssl_ca_pa th= | |
| 179 | <% else %> | |
| 180 | ssl_ca_pat h=<%= @res ource.daem on_ssl_ca_ path %> | |
| 181 | <% end %> | |
| 182 | ||
| 183 | # | |
| 184 | # Setting: max_threa ds | |
| 185 | # Type : integer ( 4-128) | |
| 186 | # Purpose: Internall y the daem on uses a "pool" of worker thr eads to de al with | |
| 187 | # activity from each connected agent. In certain ve ry busy se tups | |
| 188 | # you may n eed to inc rease this number in order to service al l of | |
| 189 | # those con nections q uickly eno ugh. Each extra thre ad you cre ate does | |
| 190 | # have reso urce usage (memory, CPU etc.) implicatio ns so do n ot just | |
| 191 | # increase this arbit rarily. | |
| 192 | # Default: 8 | |
| 193 | <% if @res ource.daem on_max_thr eads.nil? %> | |
| 194 | #max_threa ds=8 | |
| 195 | <% else %> | |
| 196 | max_thread s=<%= @res ource.daem on_max_thr eads %> | |
| 197 | <% end %> | |
| 198 | ||
| 199 | # | |
| 200 | # Setting: collector _host | |
| 201 | # Type : string | |
| 202 | # Purpose: Sets the host name of the New Relic dat a collecto r host to use. | |
| 203 | # Please no te that th is is NOT any form o f local ho st. It ref ers to | |
| 204 | # the New R elic provi ded host. There is v ery little reason to ever | |
| 205 | # change th is from th e default except in certain ve ry special | |
| 206 | # circumsta nces, and then only on instruc tion from a New Reli c sales | |
| 207 | # person or support s taff membe r. | |
| 208 | # Default: collector .newrelic. com | |
| 209 | <% if @res ource.daem on_collect or_host.ni l? %> | |
| 210 | #collector _host=coll ector.newr elic.com | |
| 211 | <% else %> | |
| 212 | collector_ host=<%= @ resource.d aemon_coll ector_host %> | |
| 213 | <% end %> | |
| 214 | ||
| 215 | <% @resour ce.additio nal_config .each do | config, va lue|%> | |
| 216 | <%= config %>=<%= va lue %> | |
| 217 | <% end %> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.