Commit Graph

Select branches

Hide Pull Requests

goreman

main

proposed-changes-for-v2

refactor-template

#10

#10

#1011

#102

#1022

#1026

#1029

#1037

#1037

#106

#1069

#1071

#1073

#108

#1083

#1088

#1090

#1096

#1096

#11

#1100

#1100

#1106

#111

#1111

#1113

#1115

#1116

#1118

#1118

#1120

#1123

#1124

#1129

#1130

#1134

#1134

#1135

#1135

#1137

#1140

#1145

#1146

#1146

#1154

#1154

#1155

#1155

#1157

#1159

#1159

#1160

#1160

#1163

#1170

#1172

#1172

#1176

#1176

#1179

#118

#118

#1184

#1185

#1187

#1188

#119

#1193

#1194

#1197

#1198

#12

#1203

#1213

#1215

#1217

#1219

#1219

#1220

#1225

#123

#1230

#1234

#1235

#1235

#124

#1242

#1243

#1243

#1252

#1255

#1257

#1261

#1262

#1263

#1269

#1276

#1277

#1278

#1292

#1293

#1294

#1294

#1296

#1298

#13

#1301

#1302

#1306

#1307

#1308

#1308

#1313

#1318

#132

#132

#1322

#1323

#1326

#1326

#1328

#1332

#1336

#1337

#1338

#1342

#1342

#135

#1353

#1356

#136

#1366

#1369

#1369

#1373

#1379

#1386

#1388

#1393

#1396

#1399

#1402

#1405

#1405

#1407

#1409

#1417

#142

#1429

#1430

#1430

#1432

#1437

#1438

#1444

#1446

#1447

#1447

#145

#145

#1452

#1470

#1477

#1477

#1487

#1487

#1488

#1496

#1499

#1499

#15

#15

#1500

#1505

#1508

#1510

#1511

#1518

#1519

#152

#1532

#1532

#1538

#154

#1542

#155

#155

#1557

#1558

#1558

#156

#156

#1560

#1563

#1563

#1571

#1572

#1574

#1577

#1578

#1579

#1584

#1585

#1590

#1594

#1599

#1601

#1603

#1607

#1609

#161

#161

#1610

#1612

#1616

#1617

#1618

#1618

#1619

#1620

#163

#1641

#1644

#1644

#1649

#1653

#1659

#1662

#1667

#1679

#168

#1686

#1691

#1692

#1697

#1698

#1699

#170

#1708

#1714

#1718

#1719

#1720

#1721

#1722

#1723

#1724

#1725

#1726

#1731

#1736

#1737

#1737

#174

#1747

#1753

#1756

#1757

#1760

#1764

#1770

#1773

#1774

#1775

#1779

#1779

#178

#178

#1788

#1791

#1797

#1798

#1807

#1819

#1820

#1821

#183

#183

#1834

#1835

#1836

#1843

#1848

#185

#1853

#1856

#1857

#1858

#186

#1861

#1862

#1862

#1865

#1875

#1882

#1884

#1886

#1888

#1895

#19

#19

#1901

#1902

#1916

#1917

#192

#1925

#1927

#1928

#1929

#1931

#1933

#1934

#1938

#1938

#1939

#194

#1940

#1960

#1968

#1971

#1975

#1976

#1984

#1985

#1988

#1988

#1991

#1992

#1995

#1996

#1997

#2

#20

#20

#2002

#2002

#2004

#2008

#2011

#2011

#2012

#2014

#2016

#202

#2024

#2025

#2028

#2031

#2036

#2036

#2040

#2042

#2045

#2046

#2057

#2058

#206

#206

#2069

#2069

#2072

#2077

#2078

#2078

#2079

#2080

#2081

#209

#209

#2091

#2091

#21

#21

#2102

#2110

#2115

#2118

#2121

#2127

#2130

#2130

#2132

#2134

#2136

#2137

#2140

#2141

#2145

#2146

#2147

#215

#2151

#2152

#2153

#2155

#2157

#2159

#216

#216

#2162

#2163

#2164

#2173

#2175

#2179

#2183

#2184

#2186

#2187

#2188

#2191

#2197

#2197

#22

#22

#220

#2200

#223

#224

#225

#227

#227

#228

#23

#23

#230

#232

#232

#235

#240

#243

#243

#244

#244

#245

#245

#246

#248

#252

#254

#255

#255

#256

#257

#259

#259

#26

#260

#262

#264

#265

#271

#271

#272

#272

#273

#273

#276

#277

#28

#28

#283

#286

#286

#298

#299

#299

#30

#30

#300

#300

#31

#31

#310

#310

#311

#311

#312

#312

#314

#32

#323

#328

#328

#332

#332

#337

#339

#342

#343

#343

#344

#35

#359

#361

#361

#367

#367

#37

#37

#371

#373

#373

#374

#379

#379

#393

#393

#396

#406

#407

#408

#408

#409

#409

#41

#415

#415

#425

#425

#43

#433

#433

#436

#436

#44

#441

#442

#442

#443

#454

#454

#455

#455

#459

#459

#46

#460

#462

#472

#477

#480

#482

#483

#484

#484

#485

#485

#49

#493

#494

#50

#511

#517

#517

#518

#52

#527

#527

#54

#54

#545

#55

#55

#555

#558

#56

#561

#561

#566

#568

#569

#569

#57

#572

#574

#575

#575

#577

#577

#581

#585

#585

#587

#588

#588

#589

#590

#599

#60

#60

#605

#605

#607

#608

#608

#611

#614

#614

#618

#618

#619

#62

#626

#626

#640

#640

#649

#65

#653

#655

#656

#656

#66

#666

#668

#668

#670

#671

#676

#679

#684

#684

#69

#69

#692

#692

#696

#7

#7

#70

#70

#704

#706

#709

#709

#713

#718

#718

#719

#72

#723

#723

#724

#732

#733

#733

#734

#735

#736

#736

#745

#745

#747

#747

#750

#750

#757

#76

#76

#767

#768

#77

#770

#774

#774

#78

#78

#780

#781

#784

#784

#789

#790

#80

#80

#806

#81

#810

#812

#828

#834

#834

#837

#84

#842

#843

#843

#847

#849

#85

#85

#850

#851

#857

#857

#858

#858

#860

#861

#861

#862

#863

#869

#869

#881

#881

#882

#898

#9

#9

#90

#901

#91

#913

#914

#926

#943

#943

#951

#954

#954

#955

#957

#962

#963

#963

#964

#964

#966

#966

#969

#970

#972

#973

#975

#977

#98

#98

#982

#982

#984

#996

0.1.0

0.10.0

0.10.1

0.2.0

0.3.0

0.4.0

0.5.0

0.6.0

0.7.0

0.8.0

0.9.0

0.9.1

0.9.2

0.9.3

1.0.0

1.0.1

1.0.2

1.0.3

1.0.4

1.1.0

1.2.0

1.2.1

1.2.2

1.2.3

Mono Color

• d45c10ca66 Use nginx 1.9.5 Aleš Roubíček 2015-09-23 17:43:31 +0200
• 37299fca0b Avoid breaking change for *.example.com Mike Dillon 2015-09-13 18:00:27 -0700
• 89bff71c0e Support regex VIRTUAL_HOST values Mike Dillon 2015-03-13 22:22:54 -0700
• 4ff022402a Merge 4e9a3d9efb into 8c193ba7e1 James Lee 2015-09-12 21:25:09 +0000
• 8c193ba7e1 Merge pull request #215 from gradecam/feature/customize_improvements Jason Wilder 2015-09-12 15:23:53 -0600
• bddb647b5f Merge pull request #230 from appropriate/remove_duplicate_access_log_entries Jason Wilder 2015-09-12 15:12:31 -0600
• 9e55f5382f Merge pull request #225 from funkygibbing/default-ssl Jason Wilder 2015-09-12 15:05:53 -0600
• 83b0b25c26 Merge pull request #228 from berfarah/patch-1 Jason Wilder 2015-09-12 15:00:00 -0600
• 9440ebed09 Merge pull request #235 from thomasleveil/safeguard Jason Wilder 2015-09-12 14:56:39 -0600
• d21c6943a2 Merge pull request #1 from appropriate/safeguard Thomas LÉVEIL 2015-09-12 16:52:01 +0200
• f95ff82ad0 Adjust entrypoint to always warn on missing socket Mike Dillon 2015-09-12 07:18:12 -0700
• 1aac996019 conform to Docker official images best practices Thomas LEVEIL 2015-09-12 10:37:21 +0000
• d83ba3da1e refuse to start if the docker sock isn't available Thomas LEVEIL 2015-09-11 22:05:54 +0000
• dc83bf66bd Merge 4931255057 into e47df7a884 TheKnarf 2015-09-10 11:36:07 +0000
• 4931255057 Added a higher client_max_body_size than standard Frank Lyder Bredland 2015-09-10 13:23:36 +0200
• 900a676af8 Move access_log from the http level to server Mike Dillon 2015-08-23 09:00:58 -0700
• d844c124ff Bumping to latest Docker Gen version Bernardo Farah 2015-09-01 09:38:43 -0700
• ae0da36d75 Fix bugs in config file from refactor CoreOS Admin 2015-08-29 18:38:43 -0600
• 1e3a812755 Merge b919d95d94 into e47df7a884 Brice Burgess 2015-08-27 04:54:13 +0000
• b919d95d94 allow FORCE_SSL var to set SSL preference Brice Burgess 2015-08-27 00:44:47 -0400
• e47df7a884 Merge pull request #224 from appropriate/remove-boot2docker-instructions Jason Wilder 2015-08-26 15:46:04 -0600
• d066bd32e0 Fix for #188 - add SSL server block outside hosts loop Ray Walker 2015-08-26 18:35:47 +1000
• d3f56468b1 Fix for #188 - remove hostname from default SSL block Ray Walker 2015-08-26 12:49:59 +1000
• e5ad1ecfd1 Remove boot2docker-specific instructions Mike Dillon 2015-08-24 19:37:45 -0700
• e9ce8991af Merge 347e3bbda8 into 214ff827d3 Mike Dillon 2015-08-24 11:34:55 +0000
• 214ff827d3 Merge pull request #223 from appropriate/readme-expose-requirement Jason Wilder 2015-08-23 20:59:51 -0600
• 682914dec7 Document the need to EXPOSE the proxied port Mike Dillon 2015-08-23 18:39:49 -0700
• 924fcd7984 Remove error_log setting from nginx.tmpl Mike Dillon 2015-08-23 09:00:23 -0700
• 24859e3f92 Merge pull request #220 from RichLewis007/RichLewis007-patch-typos-1 Jason Wilder 2015-08-19 22:34:22 -0600
• 235528338c fix 2 minor English language typos Rich 2015-08-19 23:52:54 -0400
• 36be582e69 Remove duplicate access log Mattias Wadman 2015-08-15 12:07:48 +0200
• 5089bf77dd Update wording in docs as per pull request feedback Richard Bateman 2015-08-14 12:34:10 -0600
• 66711ff026 Add warning about consequences of incorrectly using proxy_config.conf Richard Bateman 2015-08-14 12:19:53 -0600
• 405f4876b9 As per pull request feedback, update names to be consistent Richard Bateman 2015-08-14 12:10:47 -0600
• d9ee7ed704 Add support for adding options to the location block of a vhost Richard Bateman 2015-08-14 11:36:39 -0600
• b131b00e19 Add support for vhosts.d/defaults file with default vhost options Richard Bateman 2015-08-14 11:34:56 -0600
• d07a7d7487 Fix example command in docs Richard Bateman 2015-08-14 11:31:58 -0600
• 2eff96969a Add support for overriding default proxy settings Richard Bateman 2015-08-14 11:29:44 -0600
• 23ae831198 Merge pull request #202 from webner/default_host Jason Wilder 2015-08-11 23:41:53 -0600
• 4e9a3d9efb removed SSL V1 James Lee 2015-07-29 11:52:15 -0700
• 347e3bbda8 Fix b2d instructions Mike Dillon 2015-07-28 12:26:19 -0400
• 6965b1ead4 fallback when DEFAULT_HOST is not set Wolfgang Ebner 2015-07-26 11:38:45 +0200
• b0647dd5e9 set default_server also for https Wolfgang Ebner 2015-07-24 10:39:56 +0200
• 007ac8bbb7 Subimos el límite de max body size mulonemartin 2015-07-23 17:44:31 -0300
• 25ed19bd67 Merge 1ec5f168a3 into e1c685b679 iddo 2015-07-21 23:56:19 +0000
• 1e71e85bb0 ssl support mulonemartin 2015-07-20 18:08:41 -0300
• 3798760c49 Merge 6e11716e34 into e1c685b679 Viranch Mehta 2015-07-20 19:02:33 +0000
• e1c685b679 Update boot2docker instructions 0.1.0 Jason Wilder 2015-07-20 10:05:01 -0600
• 2d0417692b Merge pull request #192 from viranch/swarm-node Jason Wilder 2015-07-20 10:00:33 -0600
• 6e11716e34 Cleaner template for default host Viranch Mehta 2015-07-18 13:06:02 +0530
• 3c057e2277 Merge b5b96d1c71 into abb42bbc52 Donal Byrne 2015-07-17 06:47:50 +0000
• abb42bbc52 Update nginx badge to 1.9.2 Jason Wilder 2015-07-16 16:55:54 -0600
• 4f5351265a Use define & template for re-usable blocks of upstream server template Viranch Mehta 2015-07-15 20:51:10 +0530
• 784507df1a Cascade two else blocks into one using coalesce on VIRTUAL_PORT and 80 Viranch Mehta 2015-07-11 01:19:44 +0530
• 3af288166a Probando mulonemartin 2015-07-08 12:24:10 -0300
• 3ab7ad2618 Actualizado a la ultima version mulonemartin 2015-07-08 12:12:11 -0300
• 3b7fe48ce0 Vuelta atras mulonemartin 2015-07-08 10:41:19 -0300
• f812fa45ed Correciones mulonemartin 2015-07-08 10:29:26 -0300
• 3135c02dcc Más de log mulonemartin 2015-07-08 10:07:00 -0300
• 64f0cbac42 ssl change server mulonemartin 2015-07-08 10:01:44 -0300
• 05ebced7a1 Logs temporal mulonemartin 2015-07-08 09:53:53 -0300
• 0c30c9846c soporte ssl mulonemartin 2015-07-08 09:24:33 -0300
• 5fe7c4f60d Merge pull request #194 from topiaruss/fix_typos Jason Wilder 2015-07-07 08:21:56 -0600
• dece1e8ef4 Trivial text improvements Russ Ferriday 2015-07-07 11:07:45 +0100
• c4923d1f58 Use container host's IP:port if we're connected to a swarm master Viranch Mehta 2015-07-04 18:43:52 +0530
• ae85ec013b Merge pull request #186 from appropriate/prevent-generating-broken-config Jason Wilder 2015-06-29 23:40:11 -0600
• f36ca3d7a3 Prevent generating broken config Mike Dillon 2015-06-23 17:05:12 -0700
• 0bab8934c3 Merge pull request #185 from josephpage/patch-1 Jason Wilder 2015-06-22 09:35:22 -0600
• 89fe2a3898 Update to nginx 1.9.2 Joseph Page 2015-06-20 22:25:52 +0200
• 496c02ab00 Added in basic CORS support. Could do with something to allow customisation of allowed headers though. Robert Goldsmith 2015-06-18 14:14:31 +0100
• 7123f31652 Merge pull request #174 from rtrauntvein/173-rodockersock Jason Wilder 2015-06-05 12:58:37 -0600
• 6719f7636f Encourage using read-only mount for docker.sock Ryan Trauntvein 2015-06-05 10:24:45 -0700
• 3cbc5df01a Merge ff009249bb into 02bc7d2c1b Christoph Witzko 2015-05-23 18:02:32 +0000
• 527077d6ff Merge e726df15e6 into 02bc7d2c1b Tobias Munk 2015-05-22 22:44:14 +0000
• 02bc7d2c1b Merge pull request #170 from kcyeu/master Jason Wilder 2015-05-22 16:15:02 -0600
• d74a4146c8 fix indention, and file nameing Kuo-Cheng Yeu 2015-05-21 23:43:09 +0800
• da0191a778 add 'Diffie-Hellman Groups' section in README.md Kuo-Cheng Yeu 2015-05-21 15:37:19 +0800
• a10d1b50bf add support for ssl_dhparams to prevent 'Logjam' attack Kuo-Cheng Yeu 2015-05-21 15:19:58 +0800
• 2b270c9353 Merge pull request #168 from bprodoehl/master Jason Wilder 2015-05-19 14:53:00 -0600
• 3954774d65 Fix a couple things in the README. Brian Prodoehl 2015-05-19 16:16:50 -0400
• 7131b16543 fix upload limit mulonemartin 2015-05-19 11:28:43 -0300
• 60ef7a79de redirect proxy need to work properly mulonemartin 2015-05-19 10:54:04 -0300
• 503072c03f Merge pull request #72 from BenHall/default_host Jason Wilder 2015-05-14 10:00:04 -0600
• 11a8e51620 Merge pull request #163 from mko-x/close-non-ws Jason Wilder 2015-05-10 23:16:37 -0600
• b680fb003e Close marker instead of empty Markus Kosmal 2015-05-09 23:15:26 +0200
• e726df15e6 added info how to modify nginx config in startup command Tobias Munk 2015-05-08 19:42:00 +0200
• b5b96d1c71 Merge remote-tracking branch 'upstream/master' Donal Byrne 2015-05-08 13:46:04 +0200
• 05a80c150a Merge pull request #152 from kcyeu/master Jason Wilder 2015-05-03 22:46:33 -0600
• ad4be3b2e4 Merge pull request #154 from appropriate/nginx-1.9 Jason Wilder 2015-05-03 22:46:07 -0600
• 94fd06b98c Update README.md to refer to nginx 1.9.0 Mike Dillon 2015-05-02 15:57:48 -0700
• ff009249bb configure container as backup server Christoph Witzko 2015-05-02 12:56:15 +0200
• f31f70f4c4 Merge 302cb5db69 into 44a5322ce7 Andreas Elvers 2015-05-02 10:12:24 +0000
• 302cb5db69 Added SSL_REDIRECT environment option to allow http and https to run in parallel. Merged http and https server block to one according to nginx documentation. Andreas Elvers 2015-05-02 12:01:32 +0200
• 7eb785cec5 Update base image to nginx:1.9.0 Mike Dillon 2015-05-01 14:01:30 -0700
• 4d2403b5d7 Add SPDY support Kuo-Cheng Yeu 2015-04-29 14:41:25 +0800
• 1ec5f168a3 Typo Iddo Levin 2015-04-14 16:53:13 +0300
• 59f451084b Support static file serving Iddo Levin 2015-04-14 16:26:44 +0300
• 4f9a070be3 Merge 7302cd03b9 into 44a5322ce7 Paul English 2015-04-11 12:14:13 +0000
• 44a5322ce7 Merge pull request #142 from schmunk42/patch-1 Jason Wilder 2015-04-09 16:10:13 -0600
• ce3f1fa7ca show command on multiple lines, increased readability Tobias Munk 2015-04-09 22:08:59 +0200