diff --git a/pkg/ddevapp/ddevapp.go b/pkg/ddevapp/ddevapp.go index 4e1d4e7e781..deeeec2765b 100644 --- a/pkg/ddevapp/ddevapp.go +++ b/pkg/ddevapp/ddevapp.go @@ -953,11 +953,12 @@ func (app *DdevApp) Start() error { // GenerateWebserverConfig generates the default nginx and apache config files func (app *DdevApp) GenerateWebserverConfig() error { var items = map[string]string{ - "nginx": app.GetConfigPath(filepath.Join("nginx_full", "nginx-site.conf")), - "apache": app.GetConfigPath(filepath.Join("apache", "apache-site.conf")), - "nginx_second_docroot_example": app.GetConfigPath(filepath.Join("nginx_full", "seconddocroot.conf.example")), - "README.nginx_full.txt": app.GetConfigPath(filepath.Join("nginx_full", "README.nginx_full.txt")), - "README.apache.txt": app.GetConfigPath(filepath.Join("apache", "README.apache.txt")), + "nginx": app.GetConfigPath(filepath.Join("nginx_full", "nginx-site.conf")), + "apache": app.GetConfigPath(filepath.Join("apache", "apache-site.conf")), + "nginx_second_docroot_example": app.GetConfigPath(filepath.Join("nginx_full", "seconddocroot.conf.example")), + "README.nginx_full.txt": app.GetConfigPath(filepath.Join("nginx_full", "README.nginx_full.txt")), + "README.apache.txt": app.GetConfigPath(filepath.Join("apache", "README.apache.txt")), + "apache_second_docroot_example": app.GetConfigPath(filepath.Join("apache", "seconddocroot.conf.example")), } for t, configPath := range items { err := os.MkdirAll(filepath.Dir(configPath), 0755) diff --git a/pkg/ddevapp/packrd/packed-packr.go b/pkg/ddevapp/packrd/packed-packr.go index cc52e3a57f0..ea21123cc64 100644 --- a/pkg/ddevapp/packrd/packed-packr.go +++ b/pkg/ddevapp/packrd/packed-packr.go @@ -26,8 +26,9 @@ var _ = func() error { "837273d6a08a4d179462094756a51b3d": "1f8b08000000000000ff94566d6fd43810febebf628ead742d74e316ca8b5a9d102a45205d4f08aafb025cf0da93c4d4f1187b92dda529bffde4246db76f3a0e89553a7efcccfb78a6a035b66065902d5a50e40a534e26d3249d95e83048463d99c2bb0256d4c0423a062660798a402d06e0ca44288c45904e836a22536d7e2018de868035b5085c2158e310e49c5a9c4c7b64af7761ac8580d1a36230dc1f2cc8fdce3df722181e6e27fe6c32858f885031fbb82f4422c8024acd156a52313324d089c8726e5134114314b864745a5c5825d9909b0d423337d6f04a4c7da0d668e3cad9009bb9d2b8e56c084513fa3b9349c490bc3d9b00005813191dbcd83958ff736fef09c4680f26bd3010319c9d41f69a54ff7d7e3e9ec4687385814d6194640481ac448c56246114b58c8c2153810fee82e7a7b8bae7ca29ae4615c629dbe891baf747d4e40c5330aecc926b97408dcbe137abb8b6579fe397affc089dc2714a7a4c39914a618c666e118a40759f937d212c29692b8a2c06cbfb98e54ed608f9c8a22a192232345ccc5e5c32bf3631650d223a3dd452048fe12ad729bfad2c8374dcf84c512ddac722ae9c423d2bc8ea94ecd6046ea49dd3e0ca68c248484531841343a0905b2a41686c45644d0d8371050de7836b03a09541582ac7080e2799a572b43bb99baa03c45817fdfd7924db30e601b509a9ae2f55a77f1c56793228c246134cff23405cc6fae5c6f706c32a8f9c32355c3bbfa1ed0f10856c8d2297194570b66e72d20596cadc11e705354e0fa2f35b1481e6c431e325c3af52acc5cfcb12616f676fcdf49b41f9099f9378632d36858cac4a93476f0de75e7295a7c0c33f9bd9a31ebcb529b2475b1b07b76e78192334ce2cf745689cf0959f15bece22a9d3dbe07953141822ec3e83dd67f79ee7318da9278fef007819640d1f0f3fbc7b7f92bf79f7e7d15faf8e8f6043936a6a749ca77edeb8744605e3b9aff2ff601a587ee9de7a5ff6b1bd005c74f63505f12e02c6a0d073de272c5eafc2e9252e0dd09c4d8da90b62458dd5504b5615d47299e3125593b2d943c038f095cf8c33b7f45de3d9dda9ef0dc5d187bf8f3e8ca148a3e23ee0db9393f71f61a348927e0c5c6b86291c2dbd0908a149bd545080c8928d4a4f18a3e311f50651df28cb87f039db7cb91f62ec2453bdb55ea0d89346d8ad6e683b466de43e985a9618b721355fdc86d668a46d908d36b40d6f4f0eef56f5cd97dd378f65579aa2f3aeec8ca24e35a12b7f74b12dd3ff1f5dedf73a2acb8ecab65be0bcee2a5677db767c15b21b6d7b25d73aaf506a0c70285585b343721cc8c203dfccad510f6eb8f73e608b8e4159838ee330d4c721ef4aa88cd6e860985b9b9165e0245e18ae408226de1a794ed2326022f884508d95c1aec0d49e02a7c5c10c4b44640a0859c5a9ab177ae435ae7feafbf7a532186450d56ae47dd59b92168faf225ba0b5b353470b27be2665d25a5aa0ce46ecc59bb1582cb2da11670e59ccd3187fbcb3bb2376f6c4ce7371c571e31613d99819e422a3508af4908850a8a7cf5f3cbd955c91b2fbdb15d567b1b5962f8d6e956cfb7fa16682b954a78d17c302222235410d1b50bc65c1e6cbfdbec2e6f2b44bf84e9bc85d616567dc2765be7496cace47ddc5aa8bdf6d17179fc87fd9ea7e5eabac3b2dbd5c216ac7fdae958f060d8fe1c3718b389ffc1b0000ffffeaf4310c430a0000", "890b0e93bec7f4837280b2bf67919489": "1f8b08000000000000ff94566d4fdc4812fe3ebfa24e831448c00d09bbec81ee72ab845c226d568870f765b3787bdc65bb9676b7b7ab3cc36c4c7efba9db861906b8dc8d3496dd5df5d4fbcb148cc13998d0b5dafe150aef4aaa2693693cddabd061d0826632850f252c7d070bed04c483e82b043fc7005213434916413b0345c7e21bfa1381641702367e8e2035822587a0677e8e9369a24c7217642d04e4160b019274b1f0ee9924ec452019b8237e3699c22744a8455a3e562a026401b5911a8d2f3823afd029163db3a83ac6c00aaf059d51b75a6921eff686439a912559aa691bfc9c0cb96a6f20db7315b9ebbdc1155d483c93096388d67e990000586241073fec9fac7f1e1ebe02667b324987c17b812f5f207beb8bf47e7333de30dbbcc0205452a10541a1148ad9aa78c8aad12c18b222c8c963e4f9152e9f60b9c2e528825c613b3342277b54e31d890fe4aa2c9a764768f07a78666ddd8e6fb534abb75b83a6f031069d634c74512033cd2c42197c936272ac94f585b6b5675183e6c967b9d30d427e87f296384608189d19f286a1c5b08a6b8ce55c57413be9daacf08d9abf54bc74059abdd25b13033ba7209db6333fa8388a1b017d590eaec3107cc8adaf40199c2b16e33b0172a51fee07330682b90ecafa6af4d67093595f8d7a47d36226801a7320f1cfd8db4e300f6828c41cbe131d7f129679548861ab0b941e0ad49db35f6ffdd16158e62c312a273085773ec0db548af0f7bfc15102bad990ff8f80435dacd418198f52f9a41a3b5ebb7b63513bf8d7f94f0c3a20d4da198b06c88d559fa39b53f0ae4127393912d296fec4ed9dec0ee456e4e59af627ebda4de17d82056a7485c0b28c56972b738e5edcb7e22b5caa9849acb2e72af9480d4cebeeddf0dfade51b925bcd9c9ac4d9fb33e022502b1c5bd43bcdf2e69f1fc62c1c8b945c05de01fbe20a6553a5679fa3615bfda5ea5aa305e3d7b3357d4acd525494736b49f2564b9dc75c82cbedec4562ddd956d98b9dad93071c49c7ced1f5b10a9d536dddee956d9345351e12cfbab2c4c070f03d1c7cffe47dceb1cbbe7af90841ab836ee0d39bf30f6717f9bb0f3f9dfefce3c753d832bee85290633bdaba3326792c15e937900694ff896fa3adac086e1bd33d01fc18806028b0953cd530df2face91d5decffb95083b1b0b9f69d35d068296a68f4758ed7587431b88924a67c5bb719397a20ef1ecec17ef3a42b4ecfff7d7a3eba2276baa708df5f5c9c7d82ad329ea4ceb691b5a7d72d0584d0dd160a8b162ae20416743252bd43341b59fa1c3e67dbaf8f0373afc5373b5b6b098a0994e1a0de907616708e4ea0b0844e7868da63137715d4640c3a186a6d9b450789c70b921a34182f3b23ce451cf6c4d0468aa2b33ad82550d3fa207131a0614960f10121ab25a6fdc28cb8e45295a6f95113061d8a7a39e2fe98548955fb9bca1668edde95f30ba77e8bc2b4b57e81261b696fe7c462b1c81ae72573286a165bf7cbfd837db57fa8f68fd40a63834bbcb79c114a99f950a9383c54288bef8e7ef8ee81a355f4f45f56509fd5ce9ab30dba65d4edff73b57898e9e2aa6bd5b06028f65d28860d871f68b0fdfa38457ba6affa48df1b62e94bab7b72bf14f46b6f7dd5b76c7aae7bfec3f6bcf8c5b7bfeef45fefa5c5e39a4ee11cab18426803cde3229286676c9751d16dca30bb9b16b3e5d8c9c7a970a7e4e55750bc64c1666ce3eb7369184cce0b30554edb88abe170fff036195271439cbf8b1a1d0efb24ae03ac63c330647d58a6b4483e4503da98d58a3943eb17d93ac2cf3e2d915a1251123ecc8bd8639c89c661ade7e4c38acdfa2a775ef2d277cedcef3d6b3bc3bdf3dbda7bb56f9edc009e98601fd1903e1e6627ef0215def12eccc9a0df05dd19f2bbf0fee2cd638de077ee0be6be7555ff7b1bff58f515953d15bee779752f0dfeab32eb2634fafae45baeb8d958341b276923cfc7b41ed6a8e7e3ae7933f94f000000ffffcfa4a284690c0000", "8d44ed82af7644014f29142eea61d89f": "1f8b08000000000000ff9456fd4fdc3813fe7dff8a7959a4175a88a1a51fa2ef7bbd8ac215a93d21ca9d74ea47eab52789bb8e27b5271b964bfbb79f9c04f603d0dd21b14ae2679e997966c6f6188e2f65595904452e3379ed251b72909107090115390d9a9427e2d168ac35ce767374e825a31e8de1348339d5d048c7c0042ca70834430f5c980099b108d2695075602acd1582e11df0e864191fa3c9ffe654fbf8fe531243d8198d3b0b8f25cd10b84058750ad6380439a1198e46017d74f6e70800600cef917b8b3ee048df14e83b5713b4e4f200c67510451a27326067d981c54c7ad1348d28b8b4a24f7d207ab1c6dfbbed9208d4a7dacb074a3a984480451515eaedfea0fabfd68243d420b536516269d382024792f06163c5ddc6a71865cf98cc6569bb72746e6246e4a71d6f1f45da87b16c9f44c59260185f8c3aa43581d1c1f3bd17cbaf07078f2104db7f0bc1a60a3d9bcc28c90802598910ac881f83286560f489f27c273c9de2fc1e9329ce87288c53b6d603b5cb8dbb142539c3e48dcbbbe2df00355ef6bf495554c353c1e5e2c90ed031bc36414e6c54c0e9bedf0254e8a160aec2a1109a54486632f7d2715d258a4a317b24c2dc29d4bb19598d3e8899f15c4b3ba19e7c907720a42ceb9346efc9a79672101a6722b0a69ac1b88cfa75a91486d003623359ca873cfb95c4527e5d1152fda089a1793bfb49205b33a61eb5f1a878e13afeb19fa731a0009bb537dd8f007123d3cbcd6f35fa791a38ead99b7d5ff3f6b3c7c61bc625a76338210faf9f7553d78dd5e1d2da9145e9e0b7f3b701a44728a4d316756c4fedeb4ada14ddcc7872253a4e8d336ca43557b8b59ddc905cbbfcbc14eb4a7463a86408dd609dbd3983a0bca9b86bf51319f8e897d3a1d387be352e077210484d9157d3fb011f23fbe6527a6ba2fdff60ef60a1682603abdca4a1b286d34a7291c66ac2e7ade461c7b4bd259287db9bb72dba886b672e0f85af9da88a6a37abca2406751b3ca9b30c7d80fda7b0fff4def534c4fdf1f1a33b0095f4b284f747e7a76717e9c9e9dbe35f5fbd3b864d4daaee848f43bf79934ca75fb72dfc0d53cff28fecd6467201b81eea1507e12e0246afb0e2b49ba2b0dadae31b9c47a9533625c6d10a05d5564329591550cacb142f51d5b1d41d24b66155548971e696bf159efdbdf25e298ecf7f3f3e1fa4881bf27dc037171767ef61338b5fbabd65ad878f2f2be3117c1d7b2deed781251b15b77146c703ea04874361d1b30fe063b2f5f2d087d04aa6727bb97bb1230db05fac797b87dac84330a5cc31ec8051e4c20ecc8c46da01596b433bf0e6e2e86e575fabbcfd5a61dee6266b2b97b74651ab6adfe6576d98e5f1ffaa2dab8396f2bca57cd6363829db82d5ddb1bd5b48b6b403aed4576a9d1628357a3892aac0dd2372ecc9c246554fac511b6be99d799ca16350d6a0e30099a772208fe35f18add1413fd75b81a5e7f8b9315c80044dbc3df05cc433d304a82242d5567a3b075356e439de584c7f7b094c1e2129384e75a307dee1a2108f51280c7ae955311f785f75a1c42dea8b481ab47677eaa871e24b7426ada506753260af0fa2a66992d211270e594ce2d9f0686f7f4fec1d88bd6762c1b166c544362406394bc8e7fdddc467eac9b3e74f6e1557c4eafe6741f5516c2fd54ba39bc7d8fe9dd44c30916a5a57a2bf8f8840b557d86b742b82ad97875d874de4b48df8569bc06d66656bdc07653eb596f2b60aba0d451bbed936341fa8fab4ddfe58e9ac3b23bdb93d948e45bce0a44340fd09fb60b8407c1ffd150000ffffbe28d877d30a0000", + "a96cdf1957eddb10c659bdbf6e16a835": "1f8b08000000000000ffec556d4f1bb9137f9f4f314a8afe0f97ac43488122a82e0da1a0a3a54768af52d522af3dd9b5f07a72f6ec861ce2bb9fbcbba1b43df5039cc88b683d9ef9f937cf3dd01a2bc8d0a1374a685cc8d2b258e64b50e41626830579904ba9721c753abda83da8b525a3eef4e06c016b2a61251d0313b0bc41a00a3d706e022c8c45904e832a035361fe4230dc078f0555089c2358e310644a15767ab566cd6765ac058f61898ac1707db122f71faeb157de70631df1934e0fe68890332fc381101120f12835e7a84985c490402702cbd4a22803fa20f096d169b16125d9901b3442931a6b782d7a4b4f95d1c66583466de032e36e074d584a5fdb740e3f18cfa5b4a71418fe7fb03f7cd90100b8c49ae32c9a205cb8c7c229390d5b77a75757ef0e3e0e4ec8afa4d7a807ef3c31ddc351edc70f0600b075777c317dff66f6f6eafaf2e2e2ea7eebee72f6fbfbd9fceafae4ec7cf676f266760f03fdd8f2b2b4188f5ffe9bfcf2e98bf8fcbf67f0f5b7895743e5faf4627e75ff6c5bc0278fda7854dcb732f0e74e0d38479eb9ea6c013f30866e0dd48588323f22b731f015fab7b24008a8c8694dca137152a72718c65aed985459a0e34b220651492f56ab95c8b9b0e21bb35af9f0b8e6457e0ddd9fe88a6e93048089b5b4baa8d07ba3319e1ecb61e1a978101e8a07f0c6ba07934a1a1b8b062c65162bb4e100d84b85fb7d4892a4df1cb6fba0312db33e18b7a03e3862a3b00f2be95dbf8542efc9f741f958fdd2a2e73e60813e4b5a8533061340da40b0a4104c7c950936c5d6f64a4ba3eec9a5f46c5469a56f210ad2a5c5d0074c36b0e7949dd706911984600f22a92641b348e99c32101a2b115853d944795a577bbc7976377937999eceaecf2f5e5f1f9f5dde0ba914869058ca4051911a87bad33e7f421e8ad805df3448dda1a10975bc18c84d50451f56b95139488f9b28b978a1813c68139a6fc92021b3944a0bb5f3fd380f4c781ca6d6dc38654b8d209ba1128344ceae811c3e8a16544dc7424e81939a36deca6269eb18b7500b8a15625cd64035c4429d84e9ebb3ef5da476da45c4fac916452e187da49bcb0029a26b1db1ebaffead0ce7d095236d4244edb6993b6b7df92e662176d5406566901a97c4cbf6a9b9a93da88727a3ca9df9b3ac2b28c318c065be0c2cb96ce6cac41a19a02b1ea4dd47fdf4204c96f9b2dbe91c8a4723ee65e7fb89371eef34fd329f9fb7e38edc463045cf666194643c899b40202b1182150a3d0751c8c0e813e5f91f0c7ec3f54f6c6e70bd29bc3fc8df484fa5d34d996de65a218d1d48af725361489a159690cf4441faba48e956444d3d6836c268b83d1eee24b57c6b673a7e311e8e27a3f174ef6472fc62fcead5deabf1f3d9feeee4c5cef0f9c9ee687b7c3c1cef3e1ffdfa66fe7af671fe61b4bd3ddc49d071b25aa4492add4da2c82fb776669b042136edbda19799c04966382fd34451215ce9196f59a4bb520df7a4dad3fb6a676f94aa7d4c3b4f4be569a93c2d95a7a5f22f5d2a3da84c710061ed58de1e35a31a381c8d21ace25ff3e9c11172e7ef000000ffffd7624eb8b30c0000", "b8b2240fb201d888d683c17213866933": "1f8b08000000000000ffd458fd4e1c3912ff9fa7a885910221d33db0848d8850c4119220850411b2ba53487a3deeea6e07b7dd6b57cf47d2ecb39f6c3743cf3024612fd2dd45ca306397abcaf5f1ab72ad419ae20852cc582d09b85699c85756d6dc6a3f47858611a62b6b709cc154d730668a803410bb44d023344085b0900989c0540abcb6a44bf10541d0233058ea1102150852280436d4235c59f3945eee584809066d859c4090df186bf5803cefb111144e3bfed1ca1abc438482a8b27b71ec184406594a05a69adb48e818556c890d25c6b54563639c10aa34bed68a91d0aa1f16c5504841d378ad327a2452a1f27e20ebab5ca8493f98a236feccca8a45e36efb750500400a4ba8e0c9e069f7e7ceceaf60ad7cbae2178dd6045fbf42f45c73fffdeaaaddb156261c0d894c70460831128fad95b15bb471c92ca189b8a1a7cbc8934b9cde71e412a7ad08a1b8acd396b5bf4f5c6a25481ba1f2c85d6d4698e2247c465551b5df0a2a6fbe5d5f680d4e9cd3adf309e31cad15438990195d7a9fecc5b1d49cc9425b8a83e6de668962254232e3f25c58e721b0a8d21037162a34377e75be1cb1dc30457515715dc6a3edd84e15c7b49f69993ac78e84a19ac9a10e2ab6e25a863acb82e9d0186d12a9738847ccc452e7ad31fc46e43684ca74200e775a461d761cf9b5d53258ef952cc7c4d42ae13a45d887070f36daf008ca102c903c7810045d2d6342d3ea7b4c3c89256d708ecf1a54cc5a9f26a7af4ec172232ab22e495f304b872f8f5b3fb4612a540e5a81d5fc122984afe63ec8e12fb87041d0eb6840669a389b5ae8d546c0fece60e7e96c336396782e125b494149c5a8489c39e1d37ab4e9396dacc7d1e646eff609af71adc4642f36b58aaba2ea67551939a56e130feb2c4363616b17b676efdc4fac439d5fb7971054ccb012de1d9e1d9f9e272f8e5f1fbd393839825eaa795da2a2c4a5676f76196f3f1fb4dfe114b8fcd0b98534bb21b84ed4390176190342c3b1a2c487ae05ad6e88d666640e0e131225ea9ac016ba9629948c7801259b2438415e3b4f7b12100aaaa28a8412b7c4cdf1d91a94775ae2e8ecf7a3b3d6122ef1ef227c757e7efa0e7a995bf1897e17e1c9c1cba3e4ecfd9be4f0edf3a3850cfaee99f37f9d1e2d24cc42aa1c4d2a61104ced423ad3062c3112dc153e42452dd50bc47421351ec245b4fe6ccf58db30d2e5463749d033b5b0552c483bc154b03d104e23fb0804d7ca3e829148513f0256a7423f8257e787cb457daef2e6738579938baca954de08ae1b5e9b26ffd2d851eefe7f69ca6aa7d179dee87cd48c71583605f1e5ba9ddc58af837433a8f4eb699a14c8523470c87881fd43adc86809ab553d9482af2e5cefd4e0081501970215d9500adad2a07228449aa282001feb969821b73c1654008354d346cbe7dcb510c242e528782d9991531065a50db9764384d6c3231f440539f018a72d5fa13cf2f9aa540834ccf062daf23df0aa3824fc238ec62865ff52e9b18aff70c298947a8c69d4d25e579ff1781c954a53a490e2a1ab01db83ad413cd88907bfc5373c164e91d6d24602298bb4c96357926293f1c7bf3d797ccbb9b1f3ee2f37ac2ee22ee4a7a8a64eb7fb999a340c19bfacab38b42db1d5b5e1a16fb2b734587fb6e7236cc82e1b47dfa4c2529349d608f5818b8f8dd47953d9b4b14563ff948d1d7fd0d5c78de6afb9c85aaaa9af58211fdfbe3d0f85743c1ec79d3e62a649dc61c68656cb9a3031980ae3bac1b9c85c2843ee23867886a73d61136672db731f73fadc08abea615760a7e87df27ba5cbd5783dd56325354b5d8bd28486104d1382b1a1024b4ce6bac9387a78114d4ad9f5e16deb048d66979582d98e99bcfca569f8cffe0bc34aecbfad9c2c0babef0e4e8ede9e1dbf3c7eb37ac73d03a075afba06ef15d7a52b75a199d62ef45dd8f8a6dc9501a3d39afbf3a54eb173f21a3e4a3669dd17d6cf42676f45ae18d5c6f55c210f039c065f51c1c8a55a6d317521ea7a7aaecbd0d20f8d1e5b34c01dd22c774b7b95111aeb96e60d6c303c0f6664eb2ddd874ff1c7cd78e3d97af470a337b3476f1b24ebd6a7ab9525423df43a9c9d81af035e07c00e713fdb865bdbd871d6a0a686286b3465cd5867e163bbf96cb59a4b927bc0eadf72fff5bf6b3f6d6e4d3b7e82b6cdfca59f41cfe09f355af279e4ba94c5885d6ad4792bba5c7b663080cb7e6f6bc1a4f3517e75977dbf88cad5b0dcfd1d7ed96eb81d352e837edc6e4af77d35f89996030890f3bf66bc1f56e13f137ff593e027c0e8dd2f8816ba73a425c0bd1c0602cb6f60ef0f40efcfcff5ff7e9a7737ee63e5db2effbf4ad09f77ed9f11e9d72d42fcbdce68f160b7d1b8f7e1d08f7cf7d89a9f08a02233854a0b45fec95332a18055951481e9e21060ddf7554d8ed404e8680cfaf66767b0d33c1efcda14c82415092f905f6efcbd91811f00c0fd470083ed1dd8b9ec20c5fc4bd0dd3779f1fae025c0aa75bdb15611ab4927fef5b1afb30c2e14d8bad056a8e89a829b69453573dbab77bd313de7df0f5ebf3f82d5124b6da68914a5a0fddf1eef9e38a6b71fd8fb5b4f0683c1128e73afebddc160c963986ba590d302d51d738565838505ed17871ff79a7e5c0f2996b19e6fb71d64cc4613ee4792b6d3bed5d20adc5d7d7a4397705d5689c4114ad8ed9c28854a24aa9c0ad8da1a0c3a3b9d41d093cbce7a65f444600a4c4d3babeef51fde3e84138a2bc984baf9c96d67ef73e7fba49d26860d3662c1247ead9334dfda9af4bf75ceb6193777a215bab0b6695a2dfd0421b6a37c7352cace1d47cc4cbdbddb74ff07530ad359325b58d74a4ec1a083e7d4f512aef54666a440730b1c0ce638410ba99fc0fbb9d1c6edc76348f8e6222a283c40ddf75cd0b75eb1dd288a4b457e789fb46fd530647dd88ea5af56fe1d0000ffffa719cf4394180000", - "da0d52b67e205199a22371bffd8519e3": "1f8b08000000000000ff6c90418ed5301044f73e45496c33e11a1c0016eca6b12bdf8d1c3b72f7cf90db23fb7f408c6617c5af5aafea534a3c5f6eacece24ce16b26d6f1efb31c123391b4337aeb1762ab2e5a0d82bf3c1ed48ba9738dad6ed8b4301ccd4c7f940b7630aa947241921c23b0b50ecf7cbc6c1a71f4f693d1e1d741c4dc8c155a9f12e3a4ded64bf6b206a909eac85253a1616fe67fd2865631120bb4c6724f5a6ff0710c6fea19fbbdb81e852137f32a3b6d013dae217c696f3cd917e886abdd91e5244ef6eb9f6125934df187cebd8b6babcbe4a35430a98751eac33530bc3bf77672367f37398a568ec6ea938c59ea8d416c9e37129bfa8a6f46bc8e24cca5fb2bbca1737eaf217c7f9a48b10649097bebfc5fd7965981bf643fca7316e32143e21d19262831633609bf030000fffff7b4b55e25020000", + "da0d52b67e205199a22371bffd8519e3": "1f8b08000000000000ff6c924d8ed5301084f73e45496c33e11a1c0016ac981ebbfddcc87147ee7e79e4f6c87ee16fc42e4aaa2a5f95fd21253e5e6edcb893730a9f0b631def3ed24eb13092748eaefd44d4e624cd40f8adc753f562e2bc466d19592a875dcde4ad9eb09da350ad2728d13e0c593bbcf0f34b9688bdeb778e0e3f77462c6adc20ed821891725b4fdaea1aa82588a3504b950d9b9aff721bb4613816488bf59ea4dde0230c0ff182ed5e5df6caa1a879a38d6d017b5c43f8a40f3eb82f908c53ef2874300eeee71fc2c69c6c823f71ee9d5cb42d531fa981937818a5febb060677e74d0f9ecddf4d8e2a8d4763f1a98c85da8d03d98c376664f1155f8cf13a9c30a7eeaf7045e7f9bc86f0f522a16a0a4a099b76fe17d79659817fd0b6d76b16e39d06c43b6598428a05a3c9023224deb4993f89dfcee71172d496be258d5dd567e1f58a5ff02832fc451f86a28f813ba7bdae95713fc66f87d8b99e489233776efe8e654213c699a589032fe410fbcb91bb6e932871a67bf535fc0c0000ffff39e808c4d7020000", "ddf46ed3cf375cb35f52a87d8af9d54f": "1f8b08000000000000ffa4577b6fdb3812ffdf9f627663e0ec36169326fb408a45b097a6d702d7bba00d0e38348d962647121b8ad472467eb4ca7ef6032525761cfbbadb06882c91f3fccd83c33dd01a67c0cbca1f81f22e33f960b017d726393a0c92510ff6e075064b5fc35c3a06f6c0f206c1cf30001786203316413a0daa26f6a5f98460781f02967e86c00582350e414efd0c077b2d65ab756eac858054a16230dc6eccbdfb1bb7b2e7c170c71de527833d788708057345274244014940a9b940ed1525c60b7482584e2d8a9a3090c005a3d3e2ce2ac9c6bb49b768a6c61a5e8abd2af899d1c6e5938e6ce272e316930e8a3ab43c83016188de7e1e000058438c0e7e3e78befe797c7c0444f6f9a05d0cde337cfe0cc90bafdaf7dbdb7e87c8a60a039bcc28c908025909222be222895212634854e0e7dbc8d31b5cee60b9c165afc238656bdd8b6efd11a577867d302e4fa26bf7841a17dd33a98aaa7f2bb85cbddd39b4076f62d029c6442a8544666a11b2e0cb3626274258afa42d3cb1e82c6f314b9d2c11d27b292f0cc50801a1d35dde10541856718db19cc93c48c77595285f8ad933414ba7504f326f750ceccc04aea59dfacec45e5d2fd06759071d86e0436a7d0e42e34c106b5f331897f96ebf73a32398c920accf7bb4ba9dc4fabcb73bba163301449f032dff94bcad19d380da8498c3f7aae31f87651a0d2218d6c1b40f01e21eeca1a154869c86f1d171ddde815449a236f32f5e5d00a9602aa658772f25f1d93f5ef7d0f699675c0ede01797583fcd0da3fe0aa55b566f48655bf1c1f1caf4cce24b1ca4d4a95359c56928b34c205d7a3e4692b693c12c9d3f1f031476b71edcce24484da89aaa826595526d1a8c7c4d33acb30101cfe08873feedc4f293692a3675b082a196409efcedebebeb84c5fbefee7f9bf7e7d730e43ed555da2e33456dcf0de9916bf360fbf20a993f2a7f8362a674570577b0f14d036018c4161c5699ba6f43077f6eee9628b4bd9941873970a5f5b0da56455402917292e50d531d42d091807555125c69947fa1ec8393c28774271fef63fe76f7b286231ef227c757979f10e86595c698b772387cf17950908a18eb996f900c4928d8a870ca3e39eea25a2dec8d92770958c4e4f025123d997e3f5ecc55628c161b1a1ed0d6a234fc0943247da07a3bca37d98198d7e1f64ad8ddf87579767db557dacf2e6638579939baca95cde18e51b558726ffd4d02c8fff9f9ab23a6e7c9e373e9f35739c964dc16abb6d6f5690adb59807f1955aa7054a8d01cea42a7072e61d076fe1fbaa9e5aa3bedf70ef22e00c1d83b2061d53d776fb36ec72288cd6e8a0abeb11b10c1c97e7860b90a03d8f7b3997f1b8360455a450b595c12ec194950f1c8f76d31df3c43e202405c7aa9eeb5eae716d4b6a4f80c260904115cb5eeeafad29b145fd2692395a3bb9717eeec46f5199b4d6cf51273ded5da79fcfe749e93c270e594c63f37d767078200e8ec5c14f622563838bbdb79418e42cf12117b1fd8b90a91f7efaf98747c11531badfad445d89f15abc34ba65b4edaf41cd1ea652ddd495e8460441be0eaa9b51e89105a3d39336c3a6f2a689f48d36c44d666563dc7b653e34d6e74d45baa1a2a1df6d43f3f7befa306efe7890595b2dbd57f30b884cce62c62746f93536ebf3d4794e335f3bbd917f5bf2f21e81cbff5efcfb0826f077ebd54d4f1afd56beac3c61d8e1ebdd765752e45d13f9ff04e2bbf4651617990fe50e7d77dbefaf930f4fae924569bf5e95952eaf65be2b8ced6413697a5da3d39345699b85cdbe1ca7dd4afb861867efeeacd9a11d179cc6e44919cbca4ac6ab8417dcc4e5156fa4a058c4d49a1709569be34d6242aeab6d845fef4d69486104097d4d5005cfa818f50e9f44f264ad304e5dd6a82c6f96f2b4b40dd39a455b2ba6ab966fc13ea05a2a8ba1bd73445c7d906109dd1ce783796432a4f14ceab99ac8314ec5d7eb7f70bfe81b6cdb7675ecb3f15bead2b84d23ee37440c5d9f0e34be43b30de63a7adf029135531981d887bec53d842a96bbb1a8414b969b765e8f4e4f66e8b40fad31472905d5bd450171dafe864c5be5567b97a3a8f2ff042ee2123547c8e395b0b343d092561fb8e0b1787f2d3e3c8dc09ead07a7798b9dff242e829949c6e61289e9b479d18f9b1d59bcb89c8ebf98122683d177138461c0df6b246e87f13863ae0312b0bbfc5e8b51f2747c958cae74fb531555f3911a45d48e29716e89234bfec954e32188e161323c022bef86b6db87b7c1d2717b6d4efb93abbbeb3ce92f84b783ff050000ffff455ea1650c100000", "e14a768e24211de4ac2dc7685905f65f": "1f8b08000000000000ff8c554d6fdb3810bdfb574cbb97b65b4b729c6f68dd18ae0378e1a440e23d1585418b23895b8ad492232bde5fbf2065c55fcaa2395933f3de3cce3c32f1979742c21a8d155afdf17e1044efbf8c7af1bb7ebff71be7b8ee67a8d030427e0be38a74c148244cca0dbc26c0d581d40993c14b217b4f58e83502e508522804b6729fda00e5c2429d6b8990e8a240452052d8e80a6aa6a8e7694883c89436d854a7422230c5416902836d4f1014f4fafd51af511a7efad4834ff0c03254a47be0bf1ebf2d6693297cbb87f96c327d7c9e6ee30bc76b7565126ce8dd67b5fa1b1372dd9dec71c2381622817b83087391a0b2081fc6f7731806d147c7423923875c558a4be4500bca1bc9254b7eb20c4128cfe55b6c152cc7f7f3805e28700c338f67d26a606b26245b497768a3ab2cf7c85a1bc9fbb5e0d8af71058c1afebf9ee6b70e9f1395b761a84b54cd69026db25036626dc852d91f065150e6a5efd60c9a8b7694098a35028344971bd0e9765dcd49ddc09941a85423ca8d14f48a985020e87f447e865222b308161d85022c98907e5eba65bf2b9a3505892ec06aa81112a61a8493b895248a02b9608472136c37f775f63c998f670fd3a736a0fd61900b72fe629c371b6c8dd3ba4bd8dc25aa32338c63eb13175258a37154db1b605fd75651653068e7d6522495255d887f7724a936aec29328446edb11184cd138cc7651755d07fb4777c0c2195da8541b77afb46a4f7a9730c24c9b0d00f84e3ed83aab0d2e27da3419373123b29c0060f2fafb43f211cea2e8b27f160d6e5ac19f61a692003e74abf2debe6b7de0fe7edd66f00bf726f4b7364eb44a4536eab9067126f58ac9e6c30784b2c4e45ec44739231cc5efbe4fbe8e17e3ef8bbcfa0cd10dfcc9149c4567110cae6f8757b717e7f07b1445d18f1fa338f4881d6d78c21b276653d2519f9fb8d9b5195ee0c5259e5f5f9e5d0e30ba1aa44376c16e86787ec3a3ab9beb0bdfc721f6da1c91c65c58778d96fe855c169a5712ed2865d2621c7627776083cdd4edf1345687011f244f551a4cc5cbee0c5ee341ea902a3ce68a39a6ac92b4b44855d9d127d14a61e20c7b9af405b9b6b413c0575e820f76d757168d62059e605e13ddb892595b6bc34f70af896e1c5f7576db86bb3142097a2646e8fe71d91df679ba80c7f1c3f4192a4aaf3dcf5169375fa139ca1d4db1b1ffc8730f6f32dd28da947bba4bae971ed8ecd8e5de1814d78b036433a56db41bc312126b1c0de270fbebd408e15b4e88c3373c14871d8e8e2d5af7fa2e2d5bef69746fb8f5420ff2cdab11ee3f1b31e38550fbd7465784e6f8d2f8aa9c8a8ee1c6cc646f6d2a355ad1e381613c9397b64b768ce794340e3b44c4e181de6dcda8e7e7eb1fcaff020000ffff90b2e114a7090000", "f9ddd85cf91b505b1cd81fc628d986c1": "1f8b08000000000000ff94555f6fe238107fcfa718e91ef270b40da1d772edfd11d2a1aaa742a5b2fbb4aaa2893d01ab8e9db527d07cfb5508b09084ddee1bf8f7673c9edf287ffd5bac8a20b8ba82dfa4a4f5c5920c396492773029d9e6c84aa0d6151c00a879a0ad407df99eeb5afa42b95d13f08a402b438069fdd73ae095f2b059594d206c9e9361501954b6840d1aaea55b33b6a096c63a6a0499d204682418cbe0685f19145f0681232e9d812f01004098a278232343f8fb9fddd1f63873d6f01c73da0221ca5c99a41a0d631d855bd6eba0d10b5715dc56bf51d5e86eff1865d1783412f1683c26c2b148a39b215edf92c8febc19df9c7ac9b46dc4986a4a0a47997a6f1cc3c17754586348b0b2a6a56bdc28c352b7ef768057d637585d76d0c5656a0eedf7334a4fee679c02bddf58277fc4c9ad24dd10f2ca7fd5d77d24324b6576a59431b6df4a19c50b46a63a29be612fa69f603e994d17507236beef93a160b5de990fc313fc3538fdb59f95236f4b27a83db1ddab279eb82cfac6d21ada614c67eabc5f640e73bab0452dd9b734994d9f5f1e1f1ee7bb6ec2d9e4619acc9eff9b9e9aee504fde7753127adc375d2f8c6f051bc5aad3dd762dbaeb021fc89b922739be8e64d27ae9d3c184052e29e9bbc52f589e79546dc55bbbb5c2d9b592e47a925acf2c53cbbea68feacf3f3f3d9da9b7ed22e1aa20df2e7b643d3caaa8b1b225778ed3fae6c98a73dd8184d5bac995ef608e327d94b96348a689947d6e79a134c9e4ccfd08d75d4de9d9e6e4126359654a606fc1c630518669e93e4a49b0501d5a566a9dd4293967b0a1d4935b2bd165b043e33572175993636a263a3c19a2329e51ebcec2ef4dc2456906308ce17f3410477104717c170fef46b7f07b1445fbef46f07a1f7c0b0000ffff2a27880834070000", @@ -49,6 +50,7 @@ var _ = func() error { b.SetResolver("README.apache.txt-site-php.conf", packr.Pointer{ForwardBox: gk, ForwardPath: "da0d52b67e205199a22371bffd8519e3"}) b.SetResolver("README.nginx_full.txt-site-php.conf", packr.Pointer{ForwardBox: gk, ForwardPath: "7b5aa34c2d4e54b33bdfa575720868d4"}) b.SetResolver("apache-site-php.conf", packr.Pointer{ForwardBox: gk, ForwardPath: "52b65e9533f36bde5439e9de4c794496"}) + b.SetResolver("apache_second_docroot_example-site-php.conf", packr.Pointer{ForwardBox: gk, ForwardPath: "a96cdf1957eddb10c659bdbf6e16a835"}) b.SetResolver("nginx-site-backdrop.conf", packr.Pointer{ForwardBox: gk, ForwardPath: "7694e6e1690acfd457ffeb234da5a21f"}) b.SetResolver("nginx-site-drupal6.conf", packr.Pointer{ForwardBox: gk, ForwardPath: "510c55da05dcb25b087cf8c2fa15c03d"}) b.SetResolver("nginx-site-drupal7.conf", packr.Pointer{ForwardBox: gk, ForwardPath: "039d2f66fa8b18fcac24ad562c5fc208"}) diff --git a/pkg/ddevapp/webserver_config_packr_assets/README.apache.txt-site-php.conf b/pkg/ddevapp/webserver_config_packr_assets/README.apache.txt-site-php.conf index af5f394643f..3e7d39f2c66 100644 --- a/pkg/ddevapp/webserver_config_packr_assets/README.apache.txt-site-php.conf +++ b/pkg/ddevapp/webserver_config_packr_assets/README.apache.txt-site-php.conf @@ -9,4 +9,4 @@ the apache-site.conf file and remove the #ddev-generated line in it and change as you see fit. Use `ddev start` to restart. You can also add more configurations, for example with separate configurations -for each site. +for each site, as demonstrated by the second_docroot.conf.example, which shows how to have apache serve completely different configurations for a named site that is different from the default. diff --git a/pkg/ddevapp/webserver_config_packr_assets/apache_second_docroot_example-site-php.conf b/pkg/ddevapp/webserver_config_packr_assets/apache_second_docroot_example-site-php.conf new file mode 100644 index 00000000000..2b6dfd555d3 --- /dev/null +++ b/pkg/ddevapp/webserver_config_packr_assets/apache_second_docroot_example-site-php.conf @@ -0,0 +1,81 @@ +# ddev generic/default/php config for apache2 + +#ddev-generated +# If you want to take over this file and customize it, remove the line above +# and ddev will respect it and won't overwrite the file. +# See https://ddev.readthedocs.io/en/stable/users/extend/customization-extendibility/#providing-custom-nginx-configuration + + RewriteEngine On + RewriteCond %{HTTP:X-Forwarded-Proto} =https + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d + RewriteRule ^(.+[^/])$ https://%{HTTP_HOST}$1/ [redirect,last] + + SetEnvIf X-Forwarded-Proto "https" HTTPS=on + + ServerName seconddocroot.ddev.site + DocumentRoot /var/www/html/seconddocroot + + AllowOverride All + Allow from All + + # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, + # error, crit, alert, emerg. + # It is also possible to configure the loglevel for particular + # modules, e.g. + #LogLevel info ssl:warn + + ErrorLog /dev/stdout + CustomLog ${APACHE_LOG_DIR}/access.log combined + + # For most configuration files from conf-available/, which are + # enabled or disabled at a global level, it is possible to + # include a line for only one particular virtual host. For example the + # following line enables the CGI configuration for this host only + # after it has been globally disabled with "a2disconf". + #Include conf-available/serve-cgi-bin.conf + # Simple ddev technique to get a phpstatus + Alias "/phpstatus" "/var/www/phpstatus.php" + + + + + SSLEngine on + SSLCertificateFile /etc/ssl/certs/master.crt + SSLCertificateKeyFile /etc/ssl/certs/master.key + + # Workaround from https://mail-archives.apache.org/mod_mbox/httpd-users/201403.mbox/%3C49404A24C7FAD94BB7B45E86A9305F6214D04652@MSGEXSV21103.ent.wfb.bank.corp%3E + # See also https://gist.github.com/nurtext/b6ac07ac7d8c372bc8eb + + RewriteEngine On + RewriteCond %{HTTP:X-Forwarded-Proto} =https + RewriteCond %{DOCUMENT_ROOT}%{REQUEST_FILENAME} -d + RewriteRule ^(.+[^/])$ https://%{HTTP_HOST}$1/ [redirect,last] + + SetEnvIf X-Forwarded-Proto "https" HTTPS=on + + ServerName seconddocroot.ddev.site + DocumentRoot /var/www/html/seconddocroot + + AllowOverride All + Allow from All + + # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, + # error, crit, alert, emerg. + # It is also possible to configure the loglevel for particular + # modules, e.g. + #LogLevel info ssl:warn + + ErrorLog /dev/stdout + CustomLog ${APACHE_LOG_DIR}/access.log combined + + # For most configuration files from conf-available/, which are + # enabled or disabled at a global level, it is possible to + # include a line for only one particular virtual host. For example the + # following line enables the CGI configuration for this host only + # after it has been globally disabled with "a2disconf". + #Include conf-available/serve-cgi-bin.conf + # Simple ddev technique to get a phpstatus + Alias "/phpstatus" "/var/www/phpstatus.php" + + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet