Produced by Araxis Merge on 4/23/2019 12:15:00 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 | C:\AraxisMergeCompare\Pri_un\CCRS\claimviewer-6.3.3\claimviewer-6.3.3\conf.d | default.conf | Tue Mar 26 18:16:14 2019 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\CCRS\claimviewer-6.3.3\claimviewer-6.3.3\conf.d | default.conf | Wed Apr 17 18:39:44 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 4 | 122 |
| Changed | 3 | 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 | server { | |
| 2 | listen PORT ssl; | |
| 3 | server _name SER VER.DOMAIN .EXT; | |
| 4 | ||
| 5 | #chars et koi8-r; | |
| 6 | #acces s_log /va r/log/ngin x/host.acc ess.log m ain; | |
| 7 | error_ log /dev/s tdout info ; | |
| 8 | ||
| 9 | locati on / { | |
| 10 | ro ot /usr/ share/ngin x/html; | |
| 11 | in dex index .html inde x.htm; | |
| 12 | } | |
| 13 | ||
| 14 | ss l_certific ate /etc/n ginx/conf. d/ SERVER .cer; | |
| 15 | ss l_certific ate_key /e tc/nginx/c onf.d/ SERVER .key; | |
| 16 | ss l_protocol s TLSv1.2; | |
| 17 | ss l_verify_c lient on; | |
| 18 | ss l_verify_d epth 2; | |
| 19 | ss l_client_c ertificate /etc/ngin x/conf.d/v a_chain.pe m; | |
| 20 | ||
| 21 | #error _page 404 /404.h tml; | |
| 22 | ||
| 23 | # redi rect serve r error pa ges to the static pa ge /50x.ht ml | |
| 24 | # | |
| 25 | error_ page 500 502 503 5 04 /50x.h tml; | |
| 26 | locati on = /50x. html { | |
| 27 | ro ot /usr/ share/ngin x/html; | |
| 28 | } | |
| 29 | ||
| 30 | # prox y the PHP scripts to Apache li stening on 127.0.0.1 :80 | |
| 31 | # | |
| 32 | #locat ion ~ \.ph p$ { | |
| 33 | # p roxy_pass http://1 27.0.0.1; | |
| 34 | #} | |
| 35 | ||
| 36 | # pass the PHP s cripts to FastCGI se rver liste ning on 12 7.0.0.1:90 00 | |
| 37 | # | |
| 38 | #locat ion ~ \.ph p$ { | |
| 39 | # r oot html; | |
| 40 | # f astcgi_pas s 127.0. 0.1:9000; | |
| 41 | # f astcgi_ind ex index. php; | |
| 42 | # f astcgi_par am SCRIPT _FILENAME /scripts$ fastcgi_sc ript_name; | |
| 43 | # i nclude fastcg i_params; | |
| 44 | #} | |
| 45 | ||
| 46 | # deny access to .htaccess files, if Apache's document r oot | |
| 47 | # conc urs with n ginx's one | |
| 48 | # | |
| 49 | #locat ion ~ /\.h t { | |
| 50 | # d eny all; | |
| 51 | #} | |
| 52 | } | |
| 53 | server { | |
| 54 | listen PORT ; | |
| 55 | server _name SER VER.DOMAIN .EXT; | |
| 56 | error_ log /dev/s tdout info ; | |
| 57 | ||
| 58 | locati on / { | |
| 59 | ro ot /usr/ share/ngin x/html; | |
| 60 | in dex index .html inde x.htm; | |
| 61 | } | |
| 62 | ||
| 63 | locati on = /50x. html { | |
| 64 | ro ot /usr/ share/ngin x/html; | |
| 65 | } | |
| 66 | ||
| 67 | } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.