From f3db7abbe55dfe5c5a973790736eff50fc0dd54d Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 8 Nov 2018 12:38:15 +0100 Subject: [PATCH 1/8] suite --- app/views/layouts/public.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index e29a94a..a344348 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -76,7 +76,7 @@ =#render(:partial => "public/shared/first_menu") - -if true + -if false .info %p Opportunité : Nous possédons des emplacements sur des parkings de supermarchés dans les villes suivantes : From 369de39542db4f4f2915aeb528f3fcf5ce8354cc Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Tue, 11 Dec 2018 13:42:21 +0100 Subject: [PATCH 2/8] suite --- config/deploy.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/deploy.rb b/config/deploy.rb index 98b33ac..eaf0cc6 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -5,7 +5,7 @@ set :application, 'ual_app' set :user, 'web' set :scm_user, "git" -set :scm_host, "git.nicolasbally.com" +set :scm_host, "quartz.snlab.fr" @@ -33,7 +33,7 @@ role :db, domain, :primary => true set :scm, :git -set :repository, "#{scm_user}@#{scm_host}:root/#{application}.git" +set :repository, "#{scm_user}@#{scm_host}:nicolas/#{application}.git" set :branch, "master" From ec53ec4375e297f4ac4aee1d078319441e7531ec Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Tue, 11 Dec 2018 14:23:38 +0100 Subject: [PATCH 3/8] suite --- app/controllers/admin/contacts_controller.rb | 6 +++++- public/provenance/3.png | Bin 0 -> 12272 bytes 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 public/provenance/3.png diff --git a/app/controllers/admin/contacts_controller.rb b/app/controllers/admin/contacts_controller.rb index aca253a..6f72eaf 100644 --- a/app/controllers/admin/contacts_controller.rb +++ b/app/controllers/admin/contacts_controller.rb @@ -98,7 +98,11 @@ class Admin::ContactsController < ApplicationController } @contact = Contact.new(contact_api_params) - @contact.provenance_id = 2 + if params[:provenance_id] + @contact.provenance_id = 3 + else + @contact.provenance_id = 2 + end if @contact.save(:validate => false) render :inline => "ok" puts "OK" diff --git a/public/provenance/3.png b/public/provenance/3.png new file mode 100644 index 0000000000000000000000000000000000000000..809492ce3d73b58e090a5b6e75396940374abb4e GIT binary patch literal 12272 zcmbt)1z1#H*Y60TbV&-*N)HS%bazU3IKT`HH8e;gDBay4zvYz4na}};n_wN^mEZk=uD+-~BII(49l0>8b zLa0%d&rq>sL`ZbcT}oey#6(AujEc-YGOz{M`!=sE5`)TifmXDmRRFOzn3FDY&bugd z?latQo{KKoG?=U?`wm+&#o$>q_6g)E)3d6u;lTTXF9O90>zk>uL>L%I055FsjOhTh zduV6?r~VA~_^_qi*K88}p$`LP0g~7fp{W>wSpZ34FJdGvAQ2Eas+BJLATaqJKszHY z?SA0oJpiv?f(Rfmou^L>@Hwel_5$ri03goBq=N5Bpzs4gnW$MKZeTGQpw^;Q16T6+ z0pNK~VE@BBQo!f3vNC&dz%C{rt>k);`9?xints8n?gHM=yp^)>lyBns&gydGyjO=5a;7!L1tcI zE8!mfd==LM68;h;bP_Sx>UB96y+Zu(iuxk^qc8W>rW5ntMdxm$2;9$tE&pn4_CvVa{z_`qbTPb;+#0PwAT+F#V+78KQ$q9}{x zh)J{Njf5iX*3shP(!OL|FH~g)0swD|gv%W^&=2h6`d2x}AFuOE9P1k)BpetOCGN32$~o-n(K!LK2B(!2M+=;-#CQ@$r{`jC6pvngs_%{)M(s) z`T@^F`sq&ajmATTd`hEy^r22@J-(RJLmDXw+;(<~U;^$SI!vN`MqF8(Q3X{(_AfNf zQldlwOeEpb#PL>4Ply;BdX=rjv|c4KBrD=+#a_S4k{)8zk2m{yk0&sS4iV4A@@7oq z+55tAIOXQ?bz&xz6{g(R(@!SH3$-)f-R~)ZMRpTt}%N zUfNl+1YCCf@xaNle&0*j>>=W{XQ%4{)-ShfEnlKm>Hxw3;sC6GhY}%ol5~W8n6UfS z(uDN!aZ(0S-&DWJ*f3-T8LqiFFACadUkFeKJ3>BG|g3mZie; ztu&^z*jS>IRFZm*VV5* z$q2UC_i?(ay1u&gY^A#Ib<~mHwJG(X?`Dy2N?}MxJ+U%xU3Y`%cd++smEHR6I&+mC zQVwxJpeTw~TpCNU6~GFyWth^743N+OE)46Kr8-lnxT08GK}_8*-8=abe(H~>+Nl#< zKtJ~F{b-r9{z^aYJmn50k{3K^lQk-^Qn03~h8WZtv>1FgD3W3R$-wB=DBWnT#;7L8 zX5|xS4P#BJ?fztIp_p)@(74|-1nh8NEuFw!%E z$TuhmyMW=rVh1;@6Wgd8RuJe+3+CkAg*Vp7oh+4?i}-X$j{kJ!fQ?sHso zOdBp6)>Q8qj+f0$y_~|ELI*zv=YzNHjU3E|!8zG{K36*xGm8#S9OP;r+SAS;XE5f< ztL^H1>=5wb>dKF8yON%mP6jI@YX`8H$*c(>pY`vaR)TMY9Nl)@uGfC3Z>=iM?)M$3o?Z7U;)VW|IHBCtlFWC-tGutl< zOim`@LY|+7@1XDaK8fMt;o#2^oq6T-i5@mjIbp7c>|+KHL&&O_mZue^tz@lqe;%_m zy-U_K9gW)P8VxOw`10$Eee_EbJDN9N(<(XGwhe>?}3PU$?N_|@ zDVH8?LDorDOHuO$-~xNAKwFeV!dARd#wEibV>zFL;5?(B!e!WJ6%8N-=_NM%YXr|L zo-?TL0Pe785-WLEWX4BD!#=~3FSg67hh6q9JJ6XHVs@qY!hrC(glv`WLi({_A;qDN zEHI_^v-tU5{^9vJk+}7A{p52v{QKBSzfNj+>b!wtgYWne`Nh2piOSFAOXV9T@DDD# zUxRdabooo;Cs|8HrYXu)hM(zyxHKE!YSpta)-pSC=S3XX(C+$|{nBiG>Y#G2S5od% zM^qbLH$T5u(^8>R!`J5Kr0^{!g-6fOdFCoR($kDHSGyHK4%OeQxQ!TzsGaX_s@uIa zVtv=Fy{bK_Q?A{Dyj-EV&1r2}@S!^2++&|PUuFLB{M-)B&d65HuK)be+4^pPKi!_> z^e|9jns!3mz~x|${xJWx@m*u&>CowEs5?HwL6XXaNGOfzLgl2*u|;Xf0RgjsJS@R z2$fQpgrANZ4{HpOw|ENGN;Qg)P z&FuAQcw6&bBPfL%d?J4-f9r89QtlbLF#K{+hz4|fA~O{l9@~}sNqo}JY z@FMeYbM{t4U%NY+qnj#G6=14UkqH3s830gILHF{(49vm&ym2pYAU7)(wL?nJ+PwG7 zI__>Tk(Unu5WL5SCP@PLfCI?D0jS;!Gy@Rs;SsLjy$cSuxDjy~quya|NqP(jd*E_0 zXAf`zf1Z|X@MVw&-s#~5&OZ?36%|TF2N3E29#irM$6xp@LirEO54pyQu(G{9iHT7g zSS%++LstNR9Cb}je9t;}47I;~SOM2Da5GR-6}Ch;03lWg3n9hn~xvFLC3=l65!(I=i&x)a)X4q1%-J)bblQTC~YoQFkvlO`M-3b?!*{u+}xam zxwt$%J%OIQK!l4m7f47*h>M$ti-(63h2V63>F5UW;&gOn{9A%7)YZ}j?&JnXIMV%= z2(du8yNNNNEdA332d96;I=cQ9CRD(-Zd7#W>{M#EhIP8Ch^Iy1sQ~t#+s2BV{Kz~#IfjSAxxIiIp2p1g$ z!v62{Yy2GuIvJVY>E@?nQG-~*9e+oM^|vj5aY1DvZcs4>6oQYFTac57R|mu=4B`>y z1@o<7bzo9%Rs380ABKjMOszxh_8|428wz3q4AzU0F zs93@sAl6VWCr4`rx_>exEQ7E|xS$lHtmFN|3N%cp(BpmVzK|zQ6gOyTDOR3$g!ym-9Qx!YDB)BOt#! zLyQ5$K=;R>!S8ypcmHdUpZoX01^Rvd3t;$v0{l<9t|J^3Rvrer--YsLB(+h~4l0yj zetus5zs5D-UQl}jSvV>pu78-q!;3QJ50*bjhW|$TJrDhE6=6lVE2`XH{xwr*L!JM+ zvWL_C(H+7N%Rk+){9Tw(D~7*@;r~VY{_n#7r&v!LC@Nt8n_B%7=8Ay1c|u&EQr4&_ z|EGrF`4Bet1!VFPfF6SS}3|ayg*=s>}-t1@%CpKx>3O7BMS=6~(pd z6Ae?Hq;){k-L)pI14#>pn#!BSqPE-EK?+xJrUD1C;+LP_CKv`FF)Q5D6ZYb6WzKgc zc&E{@R+R_mj6a(K`#w0>85+W;nrL+@=1xNIF2~a&Q)ffp%!gwsM;k?eSo<<+>|oTtKCS)glaDy6`-Dd$;k-SJFmKjG zBq+;WG+avBDlA88!ZN%E6EBRX$yrI?PT@z+t*l>B28x8#hsNcm8t7#}6~~G0^AHGn zdzY&XuI-uG*#vy;)G93u?l!Nh$%s_;Ke@Q$OiTE+eAX~5!E4M$WD&C}7$rys!LOzc zHLT0@_p#m;X>vSC%StpCsxQ$fJ|mZyKRK`DkP-~*q*fSjJv+;HO?Dt>o8vOs+YvZE zZn`@pm<~8MehwqO&Z}JXAEqiSvNe0@yr5q@n4;KQh3ujZ6&g~w@_b_BdsA-L?LW<= zk1x(;g}m9T)4%-{x=o0WKc=8XMX~)NiU=k~b9vHG%Sfu$qh6DC`6T~xl)$F;m@ew|eBb^3mW%Eyfd`>TC3Y%bvtF&a>5G2B z?44WWYW-*aG{|+&^BVsn!_FTOWF?XKx_IaMJnSpK@)1d#mxjhYBR7cjjIzt_>9v*v zPhPBh0^ph;>z{6;Z2=`~TuoH0T)aZb!A&9dd}q}G^I?SYnDkNb3?gidp!UHH{SY+9 zCs9PwXlSceTT^9eA8$4{H(A+AqqnHi4m=lH{hN@(txo=XUH!XWg@rz@jlQJTvjo%* z>Z)~{%4dt2VGe)Ua* z)PuZq@R%+hkLR?>gSLKhgeNPve6pvn8{9~-V%1`Q{C9%z|&B`CPF;QC=R zdtSijs>AN%CcAM-z;#y1qCs86>W9n&R`zE5{>=B1#Fv=wD+VW}8^B`8b>9q+?<6 z`ska1YouX$!cb-=X*295WBJ^}EPu19XLe0$8hQL=f2Yh5PL2uYa{d3^_aW`%!KOf$n&^M=FvYEL*j;h@);$IBp zJ;VT#tZnDa#pMz*?{2yp+CxV7&hWg>Xm>aGgmI4D9v5N8vZm3ESXQsBt4~kz&F+kB zs7H-d%6x0tpUs+~eA$2%H1PB(3;9t0rPJ`~)pzKNUcV!g^*dkRaf{R95*GKzeJH0| z$(~P&)rmhZU@#Wm1$r8&CV^{a#D5iH(7&}Z$_m6BxWbT67v$G$bk}`9zgdY$-w9@| zdLgYhyff=rZk0mMB|sn7pc?EbWjHm|a*hL(4m;w}x4T?e(48KGOul2HM7|fX_62o# z!Gav;Qa_UNK>Vts&koz@a4g-Bu%!b^ORZ+Uo;>VgGKean*XYhK(48@ym!_q>1HM(6FQmQaW$?EQ|43h|uxcd;ADC|4~0qk65w z%Frzlb-!p04xjoBhpK zxjy{Vwjy4RXT7sNCbTp=UoewNHZjpKv?7U8BEn0^HnBn~_$3kae9t`mc9GSbWTn{lcDOrhTx}-LVc< zf7#3j;?!KuPlIH}?l+=VR_moQ6Y%McKyG40_~%d84Utc_bNoE1V+(Y`YAgHaYk?xV zTwRR)Zm&X_>*qs#ZVxo);`mL>mM2%078l}6ro#ne@W^H)Wc~I}Ycm}jTT7cl_x)hJ7dV#P!?lS*eliFU0(w~Ra9c8-j#F1QXb zC1OV&>$WqjYPC0Z9g5v7)Gi!st+k%7#iV)+Jbj&JNf84TO!+|(uq3Vi-pVk2Ylq+X z*L}}~q0f}HUJExL*qGT{ZEP8&S@;bb%0#Uf+aD};Rtmfj`u+`eckn`?awai@P9-ey zKEd-aMT;Lh^>VImrqA9Z;_mR#JC`CSQ~KR&n{nk{sgsCi)mp{8S*gz`c7i*b`@QTF zFf)x(=OsAKH_25csgw{+dgx#3V+PDd?RQtl&diGGF|ugkc$`7#cLjOWzyw3QE13jiU7y=OTAA^GM5AR`Z|RgTb^BAHQDjt&33S2 z*%o=tb;C=5ZW#}0H+Mg_O#5x9-c1VINoNU)8AfnRQ>b)(S=MsUjA?G2+;ux%WOl7j zw@fA*rxRm*PM=H{;_RL9?vtd)b;L1bO8rfm9=p#)>8b$Yacad)OVx0@3kALG)wg1g ztDwXdyVOEOIl(xi7|0I(VzkF?Pt$dl;oiCH!&vYsUVRGiYl?F3Zf3E0{n-3fFLV1D zo;N`@|MYhkmcouQ9mBlN7m5k?MvtG5+WXlV@HKMIPvjqywWJKFCB6uG|3qPyv~U#2S6jx$q_sd_-smUTAZNce6=QT$w{-nly9F2DOa zt9}P}mzOGHi|V0~h>VkT0ld=UlQW?$gkL){jKJpevWP$YmqocL8`;ld6`~GS@6qn3 z!UA0j_5_i<_99ms&xhxT-K`um39TRwafMrbYASrN$hMl)yC4kdck@3*T>8?J zIe@HjFlMabiI6Vic7r!oN}4H2me+XMI%Vf}5|!_3?-C0*%@=t5W~61hW`Ma8NrU-= zT{)%BIb|+{n50(9WJ7W5g%Mm+FTJSS9=`OefBSWi+e@ZFOLcjB5OTOq!bFCZl8O}S z4rrZn=ft(eshnU4DFg5O_&B20*!9#xH_B{v{V;RJrpOkZeR1y@R#KdlRJI(`e8;`B zQ~WnwJjab5je{EjyYL!#*yaXKWC9uo{#`Zu3aH=LX#ht3GeD54m1j&ReRFH6?!Hu9 zA>Ahl2D#_{o<7&%(|C&k>g2Nu{v_JCZ*$wq`V|>2*d*znCVgy5)qQg3_oHtSdaO0P z{@T=-%F6R{CuYtL>pq$Vtm+3cc|039Yk@Zy*R}csIH6fmiabgmdsXQMDS9cX@cRlfo+8?U*cMjjO4c@-SyA8Eq`FMt%s@RKXp3&m&ik$!P z@~S1$dblp+pxt^koHw!Wz40e!7Wu_{iEbU0WqJ{EUvdcquQ)y1FdH_BBZI4iJC?h` z3nw1fOneNu`O(Okx#q>X_)vsvf5EeS57rC&YGv{2=rAD5kEf4G)-d1g)Ys5o_+`uM z+pbXj)|fG|`d$?WNtcgn3K9la9cM2oR`TiBD`G44%^cgj%S)Rc)<#}g2q$xM24&?i zva%-)^^!71W%_I^?t6aUSqku9l9IKxML+Rgoo>^+9h}aIQ1*Zwc18+?by*Ni6y>Mxn0&!hJ-NfL}7lU zF1GfgFRX`!W-7(Z;lwqC>Q6sg*7mhiw~nrrzjMhhKl?U+O(03D$5#kuVP|x_nWcPQ znF+E^p|3yO*m!_J-O(#EI^R;8Pp|J;IcW1S^IE#JWg4ww#np*_R7np%^%8u!KUoG$VZ10wH`3T7oRDaPDq#T3)`L zS`n6}c@e8aFP7ZSA2l;AL44X~-LP|uCE%)7@`Auo2=!-LIV z2}VJQ^R?))cNkbnus@+55DZwDCX|Uf6zR#8zeqRe4RF zWTT*uk-@CyU?;*UB&P3iPU}LuN2K_zw+SrZEf7N`_T)({ILRdMh3F;o`D>(m{dKXF zxkGgmvfp@7{uE!fn_|0N?xk(d*RNrjdTF0NaPUe9v|7Q8vh>bakS#5EHU~h@LbAnp zqbSg_<6;7p66BrMwp-N`c~5KF`PmitX8x>q^N$ZvUdvxJYdKxD0|6sB))qMi0G zRiF;fv>Yt{wc;s2iU1lETm21X3ubV1o1t%ZT4aa$9Ed-Gy1RdT>HW|=I6LKYv0-{k4uHx248n8I`kIoT`SS_=FneGn0=a4=4hNIc2f z_t?xXTrO_*kb=eo0~q$D1OA%zn(R?9UCqkq#P|L4hqZllIVO6&uKZOGwM1zAZqBA^ zgFdgSZCf82sc^iSh|zWmxG9u9oh>OoHdZYQnur-+xS4*n9^rp?SH4u2W`HuUgm*nd z?V0h?(N6lCB9-C;BXxTeZjlO+gJpKR%LP6*P%6V(9Hznv5TH_BybWEwFO3N)mxtA9 z>sPuTo9d_rPQ>J;A zE>^()+u=kbQ{u$2J6p!N!ZlT%iPdld%~z zVG*Uznd!14t9=(3xj*)n@Wf6AHhjBvle<9SGq~VcYd7&B*KY$QaI;I_^DG?^(CC(> zUc2v*){ZBp=)eNPt%LS7SyrZt@vaWuegCX2q=|D`Ll2{IGIE$WdU|1V!uS~H=oIaq zZ~$crO9*Zu_~iY2pOQ6Z5>+Kk|FILxqRn}EpPTY~ttyekPWJY1b+Rw7zN>QfR59lA zey!T}^mRM5$yG|1%}xPL7>I*$;~PRw5|$=E$oD;Q6|6u-YRYs- z*1J?v@(l^0u?|l-5w4cV4}ASk9DbtA{7RIHoE?G!+KGf*rGnF4p73~VEfLDIC$`@k z{WG-ar3>1#HQ$x^4NPYEqvR^a&Gvof{(i{2D^fc|NXSC*UCvdzF)F5;3}=6zK!)NN%$R!DAP-fLN@l*J9L)yFWLr_?X=`mYJQ;IuJ=^S`-K+ zZa;brzpHLrt+0eIA%Z53mZ}qXan_5AnAy=#KOWiXE{{=O#>ToGm>O9HP8_W)9oDLq z9_wOjI!Rf2M=-Fedw(4Jf(ivdtDoS_kC?2z@2ypFByV5nL%dt3hCk@K%lPV(@6pvX zJJNY^X-QGPdDj>d&TZK^;O$lkNqgil? z6)P*3_PotX)29#U)=MEcQKM&wY>)cAZ?@MW=IO!#FlzIsuQ?SRD5}0~JXsX-nNAM4 zPEEM~B+J(0;Rbz3s#IiMO@GyUQGP-4XLKXi>5cOWFYXTKP)3y0^!Gvd5c0lsHJB@2 z(JXRYV(u6*>Cu4`ZwgA?JB1!V{fpV^i9Kyo-qz*X?ztSB8W{w(Sa(b_2e1qe$63a7 zQujMk_f&10HI0oEZ1+I;$hyt0Z=VXd_h=nX-`(-GMqsgz$Y7e24C)EYf;m+1R2MCx zYS^?&7>4zYFM!e3akC#_kMpR3cW)ECL>sXbHDi|Ls|%*7$L;LsYJTj=SBnkj4S;%s zGXptt3T`%>Bs#nIE`;M|F*TgwPNyqMwnf}=Mp|JX#|wM7y7uI;QItTCaDboJ+}5Y1 z^pB0)!QRwk0|Ijt!1?|hCnOm6O zFzqQGN14(X)^nXM*?qFv+1|6uA@K;B%^@I5igmZVD~^MM)rz2%GfyNeMs<-5`l_0r zrZqCd31xWm^WmAsLB`ORsmW|LUpElpZ|^9((N^*ha_QKpKbelk>>ccqayJ1E4t(_{ z`;L3XMABiB+hoXJK6oYhDI-&cOj>R6wElc4w{gUWyhmg$)lxbB6@^VtaJgiMw4m-zkd<6 zM%u^SjT<>UDZkqghq5ubGg*B$mPp#QI4pc)mr>HTAYwXnSkH%$VFJ5-BI=!3BMvee z9Lj}3HbPkKQs5EltmyCw2|vW2F$mFU4f@%X5{`z9mL}g~3DNN2p)5BwR&*eFUsi${ zGWMv?%iZnPzu?%gtG*GOaRv#|Q1*2jvX{0kAl&V7ev4%YYal^ZYjN|v44^R3Ad@yd+k%wH4i8T^e_PbBZ9|Kok*8tQEL7_A%Ice)(V6PkwP4#( z|L+LsMTLd5q%l>^camD+x7DG9*$USH>E2<6$l!vF4eB`5%TxcILwYCR9*`++C=`&J Q`kPNlPF=P_`o*jN0sOI{O#lD@ literal 0 HcmV?d00001 From b15541cbef51976bb34f53f3f917453e740546cc Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Mon, 31 Dec 2018 10:01:31 +0100 Subject: [PATCH 4/8] suite --- config/deploy.rb | 61 +++++++++++++++++++++++++------------------ config/env_init | 6 +++++ config/nginx.conf | 8 +++--- config/unicorn.rb | 12 ++++----- config/unicorn_init_d | 6 ++--- 5 files changed, 54 insertions(+), 39 deletions(-) create mode 100644 config/env_init diff --git a/config/deploy.rb b/config/deploy.rb index eaf0cc6..2602eab 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,7 +1,7 @@ - - set :application, 'ual_app' - set :domain, '62.210.187.249' +set :domain, 'quartz-www02.sysnove.net' + + set :user, 'web' set :scm_user, "git" @@ -9,18 +9,18 @@ set :scm_host, "quartz.snlab.fr" -set :rvm_ruby_string, 'ruby-2.1.2@ual' +set :rvm_ruby_string, 'ruby-2.1.2' set :rvm_autolibs_flag, "read-only" -#set :bundle_cmd, "/home/#{user}/.rvm/gems/#{rvm_ruby_string}/bin/bundle" -#set :bundle_dir, "/home/#{user}/.rvm/gems/#{rvm_ruby_string}" +set :bundle_cmd, "/srv/www/#{user}/.rvm/gems/#{rvm_ruby_string}@global/bin/bundle" +set :bundle_dir, "/srv/www/#{user}/.rvm/gems/#{rvm_ruby_string}" set :use_sudo, false -set :deploy_to, "/home/#{user}/#{application}/" +set :deploy_to, "/srv/www/#{user}/#{application}/" set :deploy_via, :remote_cache set :normalize_asset_timestamps, false @@ -49,7 +49,7 @@ require 'bundler/capistrano' load 'deploy/assets' namespace :deploy do - + # namespace :assets do # task :precompile, :roles => :web, :except => { :no_release => true } do # from = source.next_revision(current_revision) @@ -60,42 +60,47 @@ namespace :deploy do # end # end # end - - - + + + desc "Symlink shared config files" task :symlink_config_files do - - + + run "ln -s #{deploy_to}shared/storage/private #{current_path}/private_medias" run "ln -s #{deploy_to}shared/storage/public #{current_path}/public/public_medias" + run "ln -s #{deploy_to}shared/production.sqlite3 #{current_path}/db/production.sqlite3" + + sudo "cp #{current_path}/config/env_init #{deploy_to}env_init" - sudo "cp #{current_path}/config/unicorn_init_d /etc/init.d/#{application}" + sudo "sudo systemctl enable quartz_app@#{application}" - sudo "chmod +x /etc/init.d/#{application}" - sudo "update-rc.d #{application} defaults " + + + end task :start do - sudo "service #{application} start" + sudo "systemctl start quartz_app@#{application}" end task :stop do - run "service #{application} stop" + sudo "systemctl stop quartz_app@#{application}" end task :restart do - sudo "service #{application} restart" + sudo "systemctl stop quartz_app@#{application}" + sudo "systemctl start quartz_app@#{application}" end task :reload_nginx do - + sudo "rm -rf /etc/nginx/sites-enabled/#{application}" sudo "ln -s #{current_path}/config/nginx.conf /etc/nginx/sites-enabled/#{application} " - + sudo "service nginx reload" end @@ -105,24 +110,25 @@ namespace :deploy do run "cd #{deploy_to}current && rake db:seed RAILS_ENV=#{rails_env}" end - + task :create_files_folders do - + run "mkdir #{deploy_to}shared/storage" run "mkdir #{deploy_to}shared/storage/private" run "mkdir #{deploy_to}shared/storage/public" + run "mkdir #{deploy_to}shared/tmp" end - + end #before 'deploy:setup', 'rvm:install_rvm' # install RVM #before 'deploy:setup', 'rvm:install_ruby' # install Ruby and create gemset, OR: #before 'deploy:setup', 'rvm:create_gemset' # only create gemset - + after "deploy:setup", "deploy:create_files_folders" @@ -135,4 +141,7 @@ before "deploy:restart", "deploy:symlink_config_files" after "deploy", "deploy:cleanup" - \ No newline at end of file + + + + diff --git a/config/env_init b/config/env_init new file mode 100644 index 0000000..c1bd42a --- /dev/null +++ b/config/env_init @@ -0,0 +1,6 @@ +APP_RUBY=2.1.2 +ENV=production +APP_ROOT=/srv/www/web/ual_app/current/ +GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY +UNICORN_OPTS="-D -E ${ENV} -c ${APP_ROOT}/config/unicorn.rb" + diff --git a/config/nginx.conf b/config/nginx.conf index b7db246..6b629be 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -1,11 +1,11 @@ upstream ual_app_unicorn { - server unix:/home/web/ual_app/shared/unicorn.sock fail_timeout=0; + server unix:/srv/www/web/ual_app/shared/unicorn.sock fail_timeout=0; } server { - listen 80; + listen [::]:80; server_name une-autre-laverie.com; - root /home/web/ual_app/current/public; + root /srv/www/web/ual_app/current/public; try_files $uri/index.html $uri @unicorn; location @unicorn { @@ -22,7 +22,7 @@ server { server { - listen 80; + listen [::]:80; server_name www.une-autre-laverie.com www.une-autre-laverie.fr une-autre-laverie.fr www.uneautrelaverie.fr uneautrelaverie.fr www.uneautrelaverie.com uneautrelaverie.com; rewrite ^(.*) http://une-autre-laverie.com$1 permanent; } diff --git a/config/unicorn.rb b/config/unicorn.rb index b4a21a3..3d144e2 100644 --- a/config/unicorn.rb +++ b/config/unicorn.rb @@ -1,10 +1,10 @@ @rails_app = "ual_app" -working_directory "/home/web/#{@rails_app}/current" -pid "/home/web/#{@rails_app}/shared/unicorn.pid" -stderr_path "/home/web/#{@rails_app}/shared/unicorn.log" -stdout_path "/home/web/#{@rails_app}/shared/unicorn.log" +working_directory "/srv/www/web/#{@rails_app}/current" +pid "/srv/www/web/#{@rails_app}/shared/unicorn.pid" +stderr_path "/srv/www/web/#{@rails_app}/shared/log/unicorn.log" +stdout_path "/srv/www/web/#{@rails_app}/shared/log/unicorn.log" -listen "/home/web/#{@rails_app}/shared/unicorn.sock" +listen "/srv/www/web/#{@rails_app}/shared/tmp/unicorn.sock" worker_processes 2 -timeout 30 \ No newline at end of file +timeout 600 diff --git a/config/unicorn_init_d b/config/unicorn_init_d index f2a9975..1b9e7d6 100644 --- a/config/unicorn_init_d +++ b/config/unicorn_init_d @@ -7,11 +7,11 @@ set -e # Change these to match your app: APP_NAME=ecole_eft_app APP_RUBY=2.1.2@ual -APP_ROOT="/home/web/ual_app/current" -PID="/home/web/ual_app/shared/unicorn.pid" +APP_ROOT="/srv/www/web/ual_app/current" +PID="/srv/www/web/ual_app/shared/unicorn.pid" ENV=production -GEM_HOME="/home/web/ual_app/shared/bundle/ruby/2.1.0" +GEM_HOME="/srv/www/web/ual_app/shared/bundle/ruby/2.1.0" UNICORN_OPTS="-D -E $ENV -c $APP_ROOT/config/unicorn.rb" From 5ead923e1df8be9aa1d1123d9a0f14fed064dfb1 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Mon, 31 Dec 2018 10:06:04 +0100 Subject: [PATCH 5/8] suite --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index bddb660..6dd32d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,7 @@ GEM rdoc (4.1.1) json (~> 1.4) ref (1.0.5) - rmagick (2.13.3) + rmagick (2.13.4) rvm-capistrano (1.5.3) capistrano (~> 2.15.4) sass (3.2.19) From c3b26c75f30fdcf747a797067be0eeeeff2f57fd Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Mon, 31 Dec 2018 10:11:33 +0100 Subject: [PATCH 6/8] suite --- config/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/nginx.conf b/config/nginx.conf index 6b629be..d6485a9 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -1,5 +1,5 @@ upstream ual_app_unicorn { - server unix:/srv/www/web/ual_app/shared/unicorn.sock fail_timeout=0; + server unix:/srv/www/web/ual_app/shared/tmp/unicorn.sock fail_timeout=0; } server { From eb13bdb2fafcf7380e8d742ac6d31c680881a9f7 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Mon, 26 Aug 2019 10:50:40 +0200 Subject: [PATCH 7/8] suivi adwords --- app/views/layouts/public.html.haml | 10 ++++++++++ app/views/public/contacts/_thank.html.haml | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index a344348..cc5a50d 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -256,3 +256,13 @@ ga('send', 'pageview'); + + + + diff --git a/app/views/public/contacts/_thank.html.haml b/app/views/public/contacts/_thank.html.haml index fbdfe2a..5697937 100644 --- a/app/views/public/contacts/_thank.html.haml +++ b/app/views/public/contacts/_thank.html.haml @@ -1,2 +1,7 @@ %h3 Merci pour votre message -%p Nous vous remercions pour votre message et vous répondrons dans les meilleurs délais. \ No newline at end of file +%p Nous vous remercions pour votre message et vous répondrons dans les meilleurs délais. + + + \ No newline at end of file From ac43e5fce3e32d21608a268433842746cebf1ccd Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Mon, 26 Aug 2019 10:54:19 +0200 Subject: [PATCH 8/8] suite --- app/views/layouts/public.html.haml | 32 +++++++++++----------------- app/views/public/shared/_ga.html.erb | 13 ----------- 2 files changed, 13 insertions(+), 32 deletions(-) diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index cc5a50d..502c133 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -25,6 +25,18 @@ %body + + + + %a{:id => "top_anchor"} @@ -246,23 +258,5 @@ =link_to "Lux Laverie", "http://luxlaverie.com", :target => "_blank" - - - - - + \ No newline at end of file diff --git a/app/views/public/shared/_ga.html.erb b/app/views/public/shared/_ga.html.erb index f47f676..e69de29 100644 --- a/app/views/public/shared/_ga.html.erb +++ b/app/views/public/shared/_ga.html.erb @@ -1,13 +0,0 @@ - \ No newline at end of file