From eb3c88b1e1146b072690c081477495d84593cd78 Mon Sep 17 00:00:00 2001 From: Peter Deltchev Date: Sat, 12 Sep 2015 15:35:40 -0700 Subject: [PATCH] T350: Added encrypted production and stage configs, updated the cache driver, and moved the .env.example file to the resources directory. --- .git-crypt/.gitattributes | 3 +++ .../260F34CF197E4BAEC8FCB18D3F53E6CCAA9B0520.gpg | Bin 0 -> 725 bytes .../290DB155720C634A6B2FB8C6B0F6FDFF8C265086.gpg | Bin 0 -> 725 bytes .../E56903992FD8A1780E87A9B3B1EB127DB82FB666.gpg | Bin 0 -> 725 bytes .gitattributes | 4 ++++ config/cache.php | 2 +- .../environments/.env.example | 2 +- {vagrant => resources/environments}/.env.local | 2 +- resources/environments/.env.production | Bin 0 -> 513 bytes resources/environments/.env.stage | Bin 0 -> 529 bytes vagrant/install.sh | 2 +- 11 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 .git-crypt/.gitattributes create mode 100644 .git-crypt/keys/default/0/260F34CF197E4BAEC8FCB18D3F53E6CCAA9B0520.gpg create mode 100644 .git-crypt/keys/default/0/290DB155720C634A6B2FB8C6B0F6FDFF8C265086.gpg create mode 100644 .git-crypt/keys/default/0/E56903992FD8A1780E87A9B3B1EB127DB82FB666.gpg rename .env.example => resources/environments/.env.example (92%) rename {vagrant => resources/environments}/.env.local (93%) create mode 100644 resources/environments/.env.production create mode 100644 resources/environments/.env.stage diff --git a/.git-crypt/.gitattributes b/.git-crypt/.gitattributes new file mode 100644 index 00000000..17ef6016 --- /dev/null +++ b/.git-crypt/.gitattributes @@ -0,0 +1,3 @@ +# Do not edit this file. To specify the files to encrypt, create your own +# .gitattributes file in the directory where your files are. +* !filter !diff diff --git a/.git-crypt/keys/default/0/260F34CF197E4BAEC8FCB18D3F53E6CCAA9B0520.gpg b/.git-crypt/keys/default/0/260F34CF197E4BAEC8FCB18D3F53E6CCAA9B0520.gpg new file mode 100644 index 0000000000000000000000000000000000000000..cff3baa1f7dd818856f0be88e639bfb2974940f9 GIT binary patch literal 725 zcmV;`0xJE50t^G9ak;#dFlAr?5CE5J1FlB5L%c&kLGNwFqlGdptPrg@S2x?iG{`f1 zbg+y#x3EWHPdM(r#XJ-;zT9DyyZc-+#|0?To*dTyv}wsS?ovV`m2?+YNb0YeXG?W@ zUz+wC29*<%&q5$PIHbSLuqB+pSlBlY!}Blu*O7{FlEnvBeQ0UK9J?Tj4n9FtbQl?t zObRx+MXP6~QhgFYtAvy3&8Jiq-zMsp_!Z9z+n=ec)?n3%_HVXhJW;nFY`hW3a>m|+9jQNLmk0HZA;%X4LS+yZ zP(siacdvK>D+;D(XJ=N;pZaN>+XxW7S^JMn$D#mIMH;^T7CJ|bSU1shrSGz$Qbj`p znnd32U^L2IwG8B-iG$UvlLK=uKbQ^Z^8-Xf>jqaz^y9KUPxmCR{S#u5eVjlU`)$PLw10nY2(ytJSKNm?E!8u zLqSN^`w|H7EcBQHv9QnA3DXsHMoJ2!Ffik;%z6vL6iUg$`{P2bQ(uR*GzVxGq3&<6 z9}wr-FYDDB9@06Iy3DM`T*4gu(%r-Juz0f_N}iJP_E2;1dkd-JkqZ~E2)$_i*YIKA zJ=BvJ#$?@|#1S!Eji1uM0|7C#NXPK$;|el!-51507PhH&%s*5%TUO(ODYU_BEnpx% z5LR!rVV3B58|BJ2Fdt0RfF$Kn6G_4nQy@g9JOXOhkL0gycBzSb$3oeeC*c-L!rDf& z$(f9jar9za7+o%4U|aq9uFmZ@?RjinojNX#Qv)%{SL0USKiUv-%x1ZHY-ss+B4wFC z-U8R`_17FL8p&G_0(wwjtxb@Lgf{blk1zOVV9X9~Q|cD)zLppg-K Hm0r*jSPEU# literal 0 HcmV?d00001 diff --git a/.git-crypt/keys/default/0/290DB155720C634A6B2FB8C6B0F6FDFF8C265086.gpg b/.git-crypt/keys/default/0/290DB155720C634A6B2FB8C6B0F6FDFF8C265086.gpg new file mode 100644 index 0000000000000000000000000000000000000000..987b3c5accf03c7bee3f4109ea77fec66b31cbba GIT binary patch literal 725 zcmV;`0xJE50t^Gv7euw6h=1$>5B@Yu%u%c?*`{}zH>?FmH6>T#4n1wx^LFCht*RZ0 z`H&lW)}U+T;|U_t|z2W+`172SjiNdW#BYBpu3iKrSRT@Z-Fy`&gSJ;8XsR87&q2W?%x8lnx(_8t0-sc*`nq=7bWJuruUvOa@iRdkiCW*a!*0>3sO{x8U2{T250&{N;F{&)wB(dR zbq`yI`(aw@uneB8iqBmH;8tdIg7WXtc{a_vfsJ5frljzeIJ_QR;JO-QTRMp0V zRZJltw#w<>zJ5cyqS3Q0z&Df6Lu(Mnvp5l$F9`nCF=XGrWC)}0C3m-3@t4cu zTPgT}v1^3701a~dDY-Ja9~0NZV#7k9N9$HbI|5v)MQ&<^bB^`+wQH6@%l%p+2j}` z^ZH01w^d4ek#%@&bf7M_htr^v(A?KX0wHIF9351L@ZA_q(-hcA$yDYsK1o$0bH?}R&3sLZYWaLwRG#3zL*mi?QGE6! H5(j*T_lavF literal 0 HcmV?d00001 diff --git a/.git-crypt/keys/default/0/E56903992FD8A1780E87A9B3B1EB127DB82FB666.gpg b/.git-crypt/keys/default/0/E56903992FD8A1780E87A9B3B1EB127DB82FB666.gpg new file mode 100644 index 0000000000000000000000000000000000000000..49d4d584ad260e3fdb74a8a2ccef79993ccc9e6e GIT binary patch literal 725 zcmV;`0xJE50t^H6S6h#Y!|OQ#5C3CpI3@+f8kj|ci$eHQX6=$aFn@<$YhqIyG2J^dKTw(YP*le6PN)vNXUX^E4;a6xPx)<}d7k3V|>O@{F` z#thu*$TI#cZ_MQDi!B@fxtWqDCC1v(rjCh4e*pszoW@<%8gOf9+Ky_&hML9nh8j8y zK)|h0S}u5DJcg%u(oNDlt?OJwsBVov?w?Jwkw7=04pT=}g{g~M;jgls(O>DmDGl!H zw2Iq)jan9*){80K&mb{J(8`(A09*Z5deb|bn>T5b{w1mZ525rYu%iTqkOqe>vi#0W z>AoIN1&5c|iJ^&h5j7#|_4ib)QZ)~Go&!rh6pP0$}y9ZWwJqwPMn4lmf2>oV> z%xDg2FQG6G{1#Q9ou9rcz5NK)UW=SN?l(9&M;QiP5BwYGW4HqVo>BMK%Zcw4;~A`k zsrh4LyN(wS0q?npWqAtkrGYC}1w;a0MtBl+hTbaGl1mcANO9@)(^rksekKuvHxRf6 znkZemL{|*eHI0?pMoQi@rgcZq5ooY_eAimOl%o1h_G$IUy)Q$zAyP%APMOg*LzgF| z$bAlX0aI5Vwl13cjn^E$zgEyC7_#vU5%n$c7fsb0f3HnN!PyEkFeMj30VYWceneI) znj=cVe2^C#aX-50>nYN}0|C|oxWKx&Nds7~!2B>c zV})rhR#h3Sg#Dmuf&ZH??JAJruQ@9^^Y&vX;z#s-!HCa^h98C^GHd1rWY~Sw%Zl5N z#z80~Bet0z)O`XAZaVlvXO9#)y_G|%^7o4{5-LebYiFYsTWsm=Gp3J1fnGx1q#P&s HTQQjE$;eq! literal 0 HcmV?d00001 diff --git a/.gitattributes b/.gitattributes index 95883dea..011b6259 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,7 @@ * text=auto + +resources/environments/.env.stage filter=git-crypt diff=git-crypt +resources/environments/.env.production filter=git-crypt diff=git-crypt + *.css linguist-vendored *.less linguist-vendored diff --git a/config/cache.php b/config/cache.php index f4098123..fa3644f0 100644 --- a/config/cache.php +++ b/config/cache.php @@ -13,7 +13,7 @@ return [ | */ - 'default' => env('CACHE_DRIVER', 'file'), + 'default' => env('CACHE_DRIVER', 'database'), /* |-------------------------------------------------------------------------- diff --git a/.env.example b/resources/environments/.env.example similarity index 92% rename from .env.example rename to resources/environments/.env.example index 723ea439..dce9ce8c 100644 --- a/.env.example +++ b/resources/environments/.env.example @@ -1,5 +1,6 @@ APP_ENV=local APP_DEBUG=true +APP_URL=http://pony.fm.local/ APP_KEY=SomeRandomString DB_HOST=localhost @@ -7,7 +8,6 @@ DB_DATABASE=homestead DB_USERNAME=homestead DB_PASSWORD=secret -CACHE_DRIVER=file SESSION_DRIVER=file QUEUE_DRIVER=sync diff --git a/vagrant/.env.local b/resources/environments/.env.local similarity index 93% rename from vagrant/.env.local rename to resources/environments/.env.local index fda90e51..92fad214 100644 --- a/vagrant/.env.local +++ b/resources/environments/.env.local @@ -1,5 +1,6 @@ APP_ENV=local APP_DEBUG=true +APP_URL=http://pony.fm.local/ APP_KEY=AQUSDTDK5xA04yb9eO9iwlm72NpC8e90 DB_HOST=localhost @@ -7,7 +8,6 @@ DB_DATABASE=homestead DB_USERNAME=homestead DB_PASSWORD=secret -CACHE_DRIVER=file SESSION_DRIVER=file QUEUE_DRIVER=sync diff --git a/resources/environments/.env.production b/resources/environments/.env.production new file mode 100644 index 0000000000000000000000000000000000000000..81394d4c7b571e8e117d4f81b0d67608af06ede3 GIT binary patch literal 513 zcmV+c0{;B~M@dveQdv+`034h4GIT{Wl=P}u@z(YO6k8u#8e-F%K^u~OK8J!gKGIX- z1<@k69#tbtA}5Sf?dDJ3JmZ7dSkBN_KMQ`Y4;I5=kQ1gB0Ksavklm&ZSU97j24?13 zm{lRoDiqheI)8+Ux~?O|LY|Snxr0VtaSf63`BK{I$zPv6n#=3iA}}#XsTPhY8bVM* zr+d^xEqc5cx?Y6SAL<=+PUkYbmBMYXL&PH6NNSw=OurvgfAx=w6uXU2O83^OoS>ei z`HEQO0!}ItUG^olPKo*c81y}70!zI)9cp7uViQpVX-5d>@(rD!xv|7O$A3QIrA!@e z3&EBZH;vWi}BGckyq zj{<&G7Jjk>1;3H+&1u~ff|CY7URYCz?kPE~^FieMAF5(2YLC9$eP<89f(1N$f;bCc z22IBRs)L#-%e(+10fs1LKdRg%%hC#kq7jc_EjM=GU@OPM(UxXG-q{O_*Ve?_u@hHN zxhPJiN5<1E;wa5W&r~^OK?Su^Z~DSyMNQfWRORTCA^b5BWOC$VF3xA~6h>h!bm{S= Dv_AD% literal 0 HcmV?d00001 diff --git a/resources/environments/.env.stage b/resources/environments/.env.stage new file mode 100644 index 0000000000000000000000000000000000000000..76abe1a3d0208b380d9f4f999d82607c4e30bca2 GIT binary patch literal 529 zcmV+s0`C0)M@dveQdv+`0LH^ozuOm~MwQNm>7xUtuF<+F?3O{mZ-Qi1}kSQUbI0y|IW9u-Op{uFH}Myp@UtzrB5 zaQENLpx3#;>_91qG2Xm#pAL=tR*d{`&|9nlSR$kTro9&x)0tli!4cT*SOLD|9A{Iuv7xC2ulef zdjRwdpsio^10gnR=_zO|aTkYi!o^531NB>UlyYE^HDLGMS5mbCdtw)kSTn{bxo!K| zBhn=8odyQNB1DN5I3_-KHmCJDZD14W_JPg|`R@_d_Wcy5Tl8gd66LxP*H=|kF?gq0 zZp=dHIygdQTE`h$lznnm1ziKmS}FUNWv~nte~#dR((DS}9*_@d&PfZwxAnPKGe|@g TA0Gr4q`1|BDLrhP!YZzFg!l#j literal 0 HcmV?d00001 diff --git a/vagrant/install.sh b/vagrant/install.sh index 9de7edf6..feea69bb 100755 --- a/vagrant/install.sh +++ b/vagrant/install.sh @@ -31,7 +31,7 @@ cd /vagrant /usr/local/bin/composer self-update composer install -cp "/vagrant/vagrant/.env.local" "/vagrant/.env" +cp "/vagrant/resources/environments/.env.local" "/vagrant/.env" php artisan migrate php artisan db:seed