From d9556193dde32b8b03eeb32a59f7e1866793697e Mon Sep 17 00:00:00 2001 From: afornerot Date: Fri, 17 Nov 2023 16:40:41 +0100 Subject: [PATCH] docker nineboard --- dicos/90_envole.xml | 29 ++++++++++++++++++ docker/docker-compose.yml | 17 ++++++++++ docker/env/.env | 6 ++++ docker/env/.env.zapp.nineboard | 5 +++ docker/env/.env.zapp.ninegate | 3 +- docker/envole.sh | 26 +++++++++++++++- docker/volume/mariadb/envole/nineboard.sql | 1 + .../nineboard/data/public/avatar/admin.jpg | Bin 0 -> 4039 bytes .../nineboard/data/public/avatar/system.jpg | Bin 0 -> 1080 bytes .../nineboard/data/public/logo/logo.png | Bin 0 -> 5373 bytes tmpl/envole-apache.conf | 5 +++ tmpl/envole-nineboard.env | 18 +++++++++++ tmpl/envole-ninegate.env | 1 + tmpl/envole.env | 5 +++ 14 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 docker/env/.env.zapp.nineboard create mode 100644 docker/volume/mariadb/envole/nineboard.sql create mode 100644 docker/volume/nineboard/data/public/avatar/admin.jpg create mode 100644 docker/volume/nineboard/data/public/avatar/system.jpg create mode 100644 docker/volume/nineboard/data/public/logo/logo.png create mode 100644 tmpl/envole-nineboard.env diff --git a/dicos/90_envole.xml b/dicos/90_envole.xml index e424e11..65052ac 100644 --- a/dicos/90_envole.xml +++ b/dicos/90_envole.xml @@ -6,6 +6,7 @@ + @@ -58,6 +59,8 @@ oui + non + non non non @@ -69,6 +72,7 @@ + oui @@ -86,6 +90,10 @@ non + + oui + + oui @@ -104,6 +112,7 @@ Applications Secrets Ninegate Portail + Nineboard Nextcloud @@ -190,6 +199,7 @@ database_rootpassword database_userpassword activer_ninegate + activer_nineboard activer_nextcloud activer_adminer @@ -257,6 +267,11 @@ ninegate_forcethemename + + non + nineboard_secret + + scribe @@ -293,6 +308,20 @@ ninegate_forcethemename + + + + non + + nineboard_local + + + + oui + + nineboard_url + + diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 018dc7e..7295a8d 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -98,6 +98,23 @@ services: - ./volume/nextcloud/envole:/envole - ./volume/nextcloud/prestart:/docker-entrypoint-hooks.d/before-starting + nineboard: + image: reg.cadoles.com/envole/nineboard + container_name: envole-nineboard + restart: always + healthcheck: + test: curl --fail http://localhost/nineboard || exit 1 + interval: 1s + timeout: 60s + env_file: ./.env.local + networks: + - envole-network + ports: + - "9002:80" + volumes: + - ./volume/nineboard/data/private:/app/uploads + - ./volume/nineboard/data/public:/app/public/uploads + adminer: image: docker.io/library/adminer container_name: envole-adminer diff --git a/docker/env/.env b/docker/env/.env index 2ff708d..cabb85d 100644 --- a/docker/env/.env +++ b/docker/env/.env @@ -87,6 +87,12 @@ NEXTCLOUD_LOCAL=1 NEXTCLOUD_URL=${PROTOCOLE}://${WEB_URL}:9001 NEXTCLOUD_SAMBA=0 +# NINEBOARD +NINEBOARD_SERVICE_NAME=nineboard +NINEBOARD_ACTIVATE=1 +NINEBOARD_LOCAL=1 +NINEBOARD_URL=${PROTOCOLE}://${WEB_URL}:9002 + # ADMINER ADMINER_SERVICE_NAME=adminer ADMINER_ACTIVATE=0 diff --git a/docker/env/.env.zapp.nineboard b/docker/env/.env.zapp.nineboard new file mode 100644 index 0000000..0d3037b --- /dev/null +++ b/docker/env/.env.zapp.nineboard @@ -0,0 +1,5 @@ + +# == NINEBOARD ============================================================================================================================ + +APP_AUTH=${MODE_AUTH} + diff --git a/docker/env/.env.zapp.ninegate b/docker/env/.env.zapp.ninegate index da1facb..771a38a 100644 --- a/docker/env/.env.zapp.ninegate +++ b/docker/env/.env.zapp.ninegate @@ -12,4 +12,5 @@ ACTIVATE_WIDNEXTCLOUD=${NEXTCLOUD_ACTIVATE} WIDNEXTCLOUD_URL=${NEXTCLOUD_URL} ACTIVATE_WIDGENCONFIG=${GENCONFIG_ACTIVATE} -WIDGENCONFIG_URL=${GENCONFIG_URL} \ No newline at end of file +WIDGENCONFIG_URL=${GENCONFIG_URL} + diff --git a/docker/envole.sh b/docker/envole.sh index 543ac61..b773a9b 100755 --- a/docker/envole.sh +++ b/docker/envole.sh @@ -151,6 +151,12 @@ up(){ $PODCOMPOSEBIN exec $MARIADB_SERVICE_NAME /envole/init.sh $NINEGATE_SERVICE_NAME fi + if [[ $NINEBOARD_ACTIVATE == 1 && $NINEBOARD_LOCAL == 1 ]] + then + EchoVert ${NINEBOARD_SERVICE_NAME^^} + $PODCOMPOSEBIN exec $MARIADB_SERVICE_NAME /envole/init.sh $NINEBOARD_SERVICE_NAME + fi + if [[ $NEXTCLOUD_ACTIVATE == 1 && $NEXTCLOUD_LOCAL == 1 ]] then EchoVert ${NEXTCLOUD_SERVICE_NAME^^} @@ -188,6 +194,15 @@ up(){ echo fi + # NINEBOARD + if [[ $NINEBOARD_ACTIVATE == 1 && $NINEBOARD_LOCAL == 1 ]] + then + Title ${NINEBOARD_SERVICE_NAME^^} + upservice ${NINEBOARD_SERVICE_NAME} + chmod -R a+wr ./volume/nineboard/data + echo + fi + # NEXTCLOUD if [[ $NEXTCLOUD_ACTIVATE == 1 && $NEXTCLOUD_LOCAL == 1 ]] then @@ -237,6 +252,7 @@ destroyall(){ destroy openldap 1 destroy keycloak 1 destroy ninegate 1 + destroy nineboard 1 destroy nextcloud 1 destroy adminer 1 destroy phpldapadmin 1 @@ -290,7 +306,6 @@ destroy(){ fi fi - if [[ "$1" == "$NINEGATE_SERVICE_NAME" && $NINEGATE_ACTIVATE == 1 && $NINEGATE_LOCAL == 1 ]] then if [[ -z $2 ]]; then Question_ouinon "Souhaitez-vous supprimer la BDD associé à $1 ?";fi @@ -300,6 +315,15 @@ destroy(){ fi fi + if [[ "$1" == "$NINEBOARD_SERVICE_NAME" && $NINEBOARD_ACTIVATE == 1 && $NINEBOARD_LOCAL == 1 ]] + then + if [[ -z $2 ]]; then Question_ouinon "Souhaitez-vous supprimer la BDD associé à $1 ?";fi + if [[ "$?" = 0 || -z $2 ]] + then + $PODCOMPOSEBIN exec $MARIADB_SERVICE_NAME /envole/delete.sh $NINEBOARD_SERVICE_NAME + fi + fi + if [[ "$1" == "$NEXTCLOUD_SERVICE_NAME" && $NEXTCLOUD_ACTIVATE == 1 && $NEXTCLOUD_LOCAL == 1 ]] then if [[ -z $2 ]]; then Question_ouinon "Souhaitez-vous supprimer la BDD associé à $1 ainsi que les fichiers utilisateurs ?";fi diff --git a/docker/volume/mariadb/envole/nineboard.sql b/docker/volume/mariadb/envole/nineboard.sql new file mode 100644 index 0000000..fe28425 --- /dev/null +++ b/docker/volume/mariadb/envole/nineboard.sql @@ -0,0 +1 @@ +CREATE DATABASE IF NOT EXISTS nineboard; \ No newline at end of file diff --git a/docker/volume/nineboard/data/public/avatar/admin.jpg b/docker/volume/nineboard/data/public/avatar/admin.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0fa31743ef1f0778640b90cdcaa9b130ec532d13 GIT binary patch literal 4039 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 NmKzM(|NoUdRjO3;J38wtQ7^KA7_X zj0BJYzzMJuAZOeENDCxs0^kDJ1(2)le>4F20z?%c^)p#P#oeH_x%ztUHhBf9@8KNwP#mk5B++(CV#)6QI%(0E+=+nJtqB zb<9-40&ADgSoaYT*ldBiBcT=G<v!&4@ zAr)Xv`QmY^Uws5bH<>MqE--Hrl6Z3IjCK3X7Nsi*qX5jHm&*#LsGvsx%rsk`I8i3R zPyTS`h8>C0JtTwzyi{5^6GV>zxWQ~$3}QE!A756mq0DSSOjUrDrA0#|^8XH?g=WfO z7Q}d4fp~C5LCFczWH6)9)d!YZaIWqFZhPxf&5$91Xa=E}vNC^v&)79SqYF1&0bVLy zGzG*j0(7O(WhXX#SXHIv_s%ZaX=JH}DZuIjOD$Ym{{(=a8&zgcgqfbMvDQ3VJoQ7x zi1G|kfR&|1Lj?It2sF`%@_GTg{VZ-ZVr(GdUBIf+#q%UmKS@@8MBE^e`pN3D!W-jV zP~2L8_3I0z+AQ%Dn12?pGWr4pJacl-n1_pti`6*guRqUko@2Ah&b0s*#UuYd2hlpO zukns}Y&7Yv0IzJC@ANrr8v&ZGciw#&W|Ui7TNmDS(|ayG^VL-WR+TOoK*F*GjO+Bw zH%S`=e5|r>?(%|-r*+IzA70qHaHz#Em-oC~yPgJBDw1#Jebe7Lrb}*mWU{Js!2m&) z-O0)~3aVuGPST?#h*<$%*)-p&IPBXQ_*Td3L%k+z_|!fe`yHdf9jc5OCmDYn-E`d<4r0mj7UgUI(Dk2c#R8ssSTNaa>kSq7X}0wRo%B>SkbBMaa8@WT(I zvM-RM6)3RC(`lZ6Egywb_M%1}5N)gi#kRGB3`Xc;pzO++&HV3s_aU zcpee|PuJ`7(+{J++#F4oNh09Y+Uqa6M#S^(nYrQpNb`z#FJNV9(GVj3Q>5vV#202- zyRx)sNTlf^Qh?P5mRbb)O8{g?T2PX>lP!_@=IR4WEs-RONCCLE{)yzSUP5z&damJ@ zkt7IP0bcx|Xfl$<90?B*KNP5|un0>5Rv%bu5yHPJda;rii4f|G;dTXKO#`{E{zu{1 z@V(b~;gQjo%)pe04qz2hJaBVN$E+< zhk?gm-n{UV?w;#b0c5DpA!)kZ6G`>U@^jri6jA|RDlMGJgzxJoQxb!@Wli~_8KEA~ zQ~+jB;J8+j9*n9YWF2Y_0$(mGoPxe{R_`L1RVZF}*w0I{4MOVtbLx?Y4orHfbkUS$ z1?zVNyQx`P;FNBkMe(+x_Uj{IKcAj6436|1-Sf}|;zs}kRe+#fz?$;K34>sdqeRyXiYrTv&k9+XuaSzfhgeAl5caCk0r&wQz!&rroa|ZN>QVI&43!kDr7FALGZLG+}&M9gepowE*BztI8LT?|7wi z``G4(&u|n59{76`?%L;qFAnweNxg#W%j&TAoZ${Q5)M*3xA5l`;Q7sSY-n@BXebQe z&V4TY{`2q`OroKtRmGycjo9Nd#P34FLc~RZx(3ie0qj=iWSHQA^V!c@@Y+|c5v56$ z370!1T#+szE6nL%jzi$O%N%&pG_!&zNxVrV0`0aic{N~zJOzf|1;F4h>+%m+5TZY*1*p+_# z{9rRSe%*FhrfcN`z}H?CzpnP;S3_)CSwfPnNY5D-_V=+koN>t`9x(WPUCTh5%XPpP zbg3|2{I0@{lkU(>@dKAT@a(l|kRy0eM>!?DeM35aTj9pDpSNJb<((_Poxe0FxV^sx zqaDH534|oaye_Xt9&v$i{VSX1JMX&bJ(mCgo5edB2D)57>rwIR&ssu0^W@d3cS_+41n0l$gtz zmuZTRyt#F{r543+gKGef{^X}K$Z(golVAZ$Mbn{&CV6F|>A)1j7 z8~f(8kbv>Pg=t{EQ3cnusv#F-{{6}nq(;;3Yv2&TzvO5SAa^wSbt|hU!GSs#FO)Cn zhxovYq{V{kBTa9LU?XB6asSo_(5T|u=;I=z5M|2 zMU(a$H#^S?o6vu5o+1bn(zM68eRW|-k&!P{!G<1$f?1*ySZ z>0AmKz`(ebov0A;NEvMrH4P)juKgy4QjS;|bmCR~SPcih|~r(5sbtqpAiE zMwy(VEtalv4031>#zGl=#tJta(!58GJk5K(8iG>}1X4DPD>Jke;Lp__tkiK8upRc+ zLOr`z^FF1HxagYQVMk7mVap=`09n@kR8U9=W1Ky2{Q&-HSa%kuu0#Dib^w- zBfr+XEe79+1PPyL22N9q<`-O|ZHTeIR>6yv`q>96ho1tsY7YRV!Si%0t0y7@XoA7E zfVT~`;fce|nx@)6`g;>br^_*S1^(k3pj7-$^S;RX21HJ9e@d>VCY(E07gPC>GAM5# ztXA#TF%Gz704^A;0CtJ+#MP;|?+|QI#Dn19JKqssIFX34nDCK@u)M7;48gncAb?W`(g}S0n!IAI+$b zWT{qZhH~&x`1aljsM=1n#lUG00}Zu%j?k;Vl(F1&sy-x zmu}pDc?uR@V#QS%a?l|gd+VT{cpJ*$r$hGn002t{EZ6-uxj{IxAjN(JhC_dDT!483uX%Yt8d{~?PUtsqsaO0;?&+G;` z4C4-xV4e6H$Qk+sTvk>lva&KG`$9bpVwVh{!Au$E54Pf&Z=~X9VV)1Da;vBcY$?B5 z^?1bPS+0G$&o})Spaucp3$w-e=@lthJKhOvJX=6vfo1F;AdLz=Fzib((-$&`D!}IN zhu=QTj!{ktH}7ghjn11wWa|&h#Q%oK3E$7PqA2isV>25ULKwWe7a^op$U>zGmCRQF z0GQCvg2QvN@YInO{Gn2hbNvKq*sYMSehlOo98t=;x_W$dEVkIqsi`R#Gulvln}{HR z3gMMJ6=n<4k$zTz-&~u9&*x_2Ux(X~7Nv!-$ejt>tUa(?zb4|!?<>d(D#U#=Hl71u z?21Pi3{92r>h(^XUCF2Sj#5F|qk{4Olt{0(gLj=(x)BPjD~V}9UIapd=13B^nf4P8&Zq+atSy`De zuLBr9ua5v~tMm5L!SoTpJ;p1jQzl%|uRqZ5BCltmU1jDxYSJ?5~ua1F_BppQVH z^L2e*0VIL#=7^KTXqf1HU7uHgR0>l^L|AY|-at`U{Sh%l_1Wlp14ZvhG|Nl}pkMDNA3d@}8ON@`*0k-*j554BS|I zQMx3(1Ln0ID<23FGDh`_*Nl@WiIK1>UhjJCA_Z7Jr{pUzZ!$)tB!)qFw`;TzKqF|B zki?U57buCbaPT?}ssKx8tlJNuEUp42F%bUCvRNeug5A;F?-bxCRgfv6as;UVQ}CM9yeRCrExT>ed$npf$J6(glb>6Rg(Ocr{^J@58O>lmxePrzDEl#*b z7*^3iQB^VJ-q|HP!+AFBIY}TxZEs6)hWv~{+q4}wvP7t!7XS17)zci{5Yfg4ZEFE_ z4O?a)%=C1)l@COq002PQnU6AfPvm07PXCWRu+?gB_n!Th4W8`yhduISOE`C(_CVEE z>qo!8X?rG#GrMc7HIGJ;AR-00XY3lE%2E-4+K9x85xH5#fIZq%C?!?k^hAeY^3>em zfRdu!3Jl!shTLL!D^Tlaacl9^40%*whZ|A|N7ARJIN%R6 zf~X$&t%Orkw7VP0%gEhfte;^bUb3Q~B;w=DQLRfZFIe|y5Iq}B+DLJnQjmQ}yGeED z%Ba1{__c$&Yiwv4sNLmc9rPGxp+vwl_srbzel%&LUYO3VQy&JfKHBu*GI(nXLhT1t zO;0h!(I*3_o}t|e5P(7D2DAc1>rU<&^Ki7uqgH@Li#GVZifakLTcgdRJF<>=kW!`H zrPYnGp=Gdni$*PjEvO%(y}FlD$@an!CfV%nOzf9@8K#qC)@ zz{j!V6Aa;Fl-${WQA{FS zn?gYKbYuPZMnd)U)R0rsL0g+cPH8nETGy|EZ`7mD?@C-2&$qnsPyg7Fh3`0roN*um zn?mPNA5u^F;7b!h|7x$Xq2Y?e>HE8)qzVuNoZ2(y-W4le zj7vnVxOb$h%L;E~rnLaF<6TxS;~Wv+5$y_JxEL~$T3K2&L?ZP~7;ItOgV`-9N>Ml# zJ+WfQM0!O*$qCBNoXSj38&O^l=c!Yc)893s@&OZ8(c3JG{Hp-E(&(}ioI|QA?v2El zLk|pJO1pP<$xh17`X&fJgMrq@2~0BqKc(!<>x`~^z~q2=D@%)p$WWhS!uQRT!$jVa z6y-sqn)_fR#B$o2@KUMN>fh2tc#UmL)#$ zU%>R_vV!%dT32@@p%kE*|mx5$O>M(2?gi&#_tMj7h{imBG_MxE^uZ(+C4U82bpcjfu8r=}3NZG9u-)Qr-5HM^IwR@v3J{Dxeo&aL$jE0E z`CySx#3KRD0Fx60CxM&{b^>TWNa!Mvi@`21Tp)G<)WA$%fYb^m@tM`Het!4t4Tc_w bF@paG9vtvGP0F;h00000NkvXXu0mjfc{E+A literal 0 HcmV?d00001 diff --git a/tmpl/envole-apache.conf b/tmpl/envole-apache.conf index 9d8128e..28f1bad 100644 --- a/tmpl/envole-apache.conf +++ b/tmpl/envole-apache.conf @@ -7,6 +7,11 @@ ProxyPassReverse /wssninegate ws://0.0.0.0:9000/wssninegate retry=0 ProxyPass /nextcloud http://0.0.0.0:9001 retry=0 keepalive=On ProxyPassReverse /nextcloud http://0.0.0.0:9001 retry=0 +ProxyPass /nineboard http://0.0.0.0:9002/nineboard retry=0 keepalive=On +ProxyPassReverse /nineboard http://0.0.0.0:9002/nineboard retry=0 +ProxyPass /wssnineboard ws://0.0.0.0:9002/wssnineboard retry=0 keepalive=On +ProxyPassReverse /wssnineboard ws://0.0.0.0:9002/wssnineboard retry=0 + ProxyPass /adminer http://0.0.0.0:9100 retry=0 keepalive=On ProxyPassReverse /adminer http://0.0.0.0:9100 retry=0 diff --git a/tmpl/envole-nineboard.env b/tmpl/envole-nineboard.env new file mode 100644 index 0000000..77d4f7e --- /dev/null +++ b/tmpl/envole-nineboard.env @@ -0,0 +1,18 @@ + +#-- LOCAL --------------------------------------------------------------------------------------------------------------------------------- + +APP_WEBURL=${WEB_URL} +APP_SECRET=%%getVar("nineboard_secret","changeme") +APP_ALIAS=nineboard/ + +%if %%getVar("activer_ninegate", "non") == "oui" +APP_MASTERIDENTITY=NINEGATE +APP_MASTERKEY=%%getVar("ninegate_secret","") +%else +%if %%getVar("activer_openldap", "non") == "oui" +APP_MASTERIDENTITY=LDAP +%end if +%end if + +LDAP_MODEL=${LDAP_TEMPLATE} + diff --git a/tmpl/envole-ninegate.env b/tmpl/envole-ninegate.env index b97335f..339b59f 100644 --- a/tmpl/envole-ninegate.env +++ b/tmpl/envole-ninegate.env @@ -2,6 +2,7 @@ #-- LOCAL --------------------------------------------------------------------------------------------------------------------------------- ALIAS=ninegate/ +APP_SECRET=%%getVar("ninegate_secret","changeme") FORCE_THEME=%%getBool(%%getVar("ninegate_forcetheme", "non")) FORCE_THEMENAME=%%getVar("ninegate_forcethemename", "") diff --git a/tmpl/envole.env b/tmpl/envole.env index 9121a07..0fff9ce 100644 --- a/tmpl/envole.env +++ b/tmpl/envole.env @@ -59,6 +59,11 @@ CAS_PASSWORD=%%getVar("keycload_userpassword", "") NINEGATE_ACTIVATE=%%getBool(%%getVar("activer_ninegate", "non")) NINEGATE_URL=/ninegate +# NINEBOARD +NINEBOARD_ACTIVATE=%%getBool(%%getVar("activer_nineboard", "non")) +NINEBOARD_LOCAL=%%getBool(%%getVar("nineboard_local", "non")) +NINEBOARD_URL=%%getVar("nineboard_url", "/nineboard") + # NEXTCLOUD NEXTCLOUD_ACTIVATE=%%getBool(%%getVar("activer_nextcloud", "non")) NEXTCLOUD_LOCAL=%%getBool(%%getVar("nextcloud_local", "non"))