Merge branch '7-maj-jitsi' into 'master'
Resolve "maj jitsi" Closes #7 See merge request 10031/visio!10
This commit is contained in:
+23
-18
@@ -1,19 +1,24 @@
|
|||||||
$ANSIBLE_VAULT;1.1;AES256
|
$ANSIBLE_VAULT;1.1;AES256
|
||||||
30313131626662343730326264376636313733356163633234333166313461626464306139663664
|
62383664313030336230613936653439373863643231333139336331356237613831343333613163
|
||||||
3862353032373664326135313361616537313037356261640a646335363631303139623962336666
|
3137653661393266363133313965653834383266616531320a363130313239666461326334386331
|
||||||
65323365633437653666343132343965383732376335633833333235373237383533363764643737
|
64613937353366643338376666633634326234393662336335666338626536626330366465366439
|
||||||
6130346135633637350a643364626532306535663363376239353537613532303862386231393631
|
3331626161386439380a336638336631363233383031346561393166666530356438366639333236
|
||||||
62363232303237643639333730346463623834626339333566623434396638303234323631643337
|
35323565323166613337623435633135323333366561396235666435326661316464393433356266
|
||||||
36373362656233356532386234613764373539356232323935623636633938333135343963366236
|
32653839316538373336663430373762656262663764363738613539633562306530323466373335
|
||||||
62383365346232663865333837636135646462613136353734333434313537316437363638373430
|
37396465313766323235396338386362373765326432663362653733646339646261616466396164
|
||||||
64656433386366376361653363656631623363393034323239653135653963366263363562633535
|
30353736663130333937346339303361663232643430666561376237316461383466363037653264
|
||||||
34663863643436313266363763396339346634343731333035663635643335656366636562636135
|
62316161386539343738636162366638636261633866336136616132646365303563623131396336
|
||||||
64616536326165326263386431363662336234653430333531663539343733353239353062303430
|
66396165623430343038386537613865316465363361633464383236393864663836323038653936
|
||||||
37643830343430616265623361363332646665326134366166353666633164363732656635323562
|
65383965613861323337373438363431623665613563373764393336306431616566376437373664
|
||||||
37313130363832356431633862333233353632633161396535663463633565356435363663663431
|
37303234326439393333656266356338346632363632643331363839353364633130333834613134
|
||||||
32613162356632666139373033613036316666366134376561643865323730373939333964613231
|
33643164373231343765666239386439386139396166373061646431396439666632363564373034
|
||||||
33326332366438663865363437366363343335336431616161393530323066623538656662383832
|
65383137356331363037346261613433396637643137383362653334633037656361626630343766
|
||||||
64623430653530356433386538343761363964373365343435353862656166653731363833663062
|
66333030363062313365646366663034646331306563336262386266653431303064373734613231
|
||||||
33386263623834326166303161316466303530653935623533393064653562656230376439613862
|
32656163363131626538333434376535303631613463636563313930323736356536623166366437
|
||||||
36336439383565343731646134646132373035326234613833623863646230313164346464663036
|
32306538643638613565353265653761663431346334633339663939356264383630336535336335
|
||||||
6633623162396638356235393837646261626337343861626434
|
38323830646133363933633134323265353664356164636434353838363639633430383633653839
|
||||||
|
39316333646130313863373163643239353264336565343430613731333665633566313934336261
|
||||||
|
32316536303138316330326133363064376638336630363365343038633762356461326538633764
|
||||||
|
39663264393437393630613665643865356337626537626531303763323634613036623630363935
|
||||||
|
61386366323835663032383864373136653331373434653931316431303262323831313335613439
|
||||||
|
333464616666376634383765393465616133
|
||||||
|
|||||||
@@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
jitsi_logo: logo-komki.svg
|
||||||
|
jitsi_logo_url: https://komuniki.fr
|
||||||
@@ -1,5 +1,3 @@
|
|||||||
---
|
---
|
||||||
jitsi_user: nereide
|
jitsi_logo: logo-komki.svg
|
||||||
jitsi_pass: ofbiz
|
jitsi_logo_url: https://komuniki.fr
|
||||||
jitsi_logo: logo_Nereide_monochrome-blanc.svg
|
|
||||||
jitsi_logo_url: https://nereide.fr
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
jitsi_user: nereide
|
|
||||||
jitsi_pass: ofbiz
|
|
||||||
jitsi_logo: logo_Nereide_monochrome-blanc.svg
|
|
||||||
jitsi_logo_url: https://toto.fr
|
|
||||||
+1
-2
@@ -1,4 +1,3 @@
|
|||||||
visio.nereide.fr ansible_user=root
|
jitsi.komuniki.fr ansible_user=root
|
||||||
visio443.champs-libres.be ansible_user=debian ansible_become=true
|
|
||||||
visio.imio.be ansible_user=debian ansible_become=true
|
visio.imio.be ansible_user=debian ansible_become=true
|
||||||
jitsi.entrouvert.com ansible_user=root
|
jitsi.entrouvert.com ansible_user=root
|
||||||
|
|||||||
@@ -1,3 +1 @@
|
|||||||
visio.nereide.fr
|
|
||||||
pp.visio.nereide.fr ansible_user=root
|
pp.visio.nereide.fr ansible_user=root
|
||||||
pp.imio.nereide.fr ansible_user=root
|
|
||||||
|
|||||||
+4
-6
@@ -3,7 +3,6 @@
|
|||||||
roles:
|
roles:
|
||||||
- role: jitsi-pre-install
|
- role: jitsi-pre-install
|
||||||
- role: jitsi-install
|
- role: jitsi-install
|
||||||
- role: jitsi-enable-LE
|
|
||||||
- role: jitsi-enable-fr-ln
|
- role: jitsi-enable-fr-ln
|
||||||
- role: jitsi-add-logo
|
- role: jitsi-add-logo
|
||||||
- role: jitsi-enable-video-optimisation
|
- role: jitsi-enable-video-optimisation
|
||||||
@@ -11,23 +10,23 @@
|
|||||||
tags:
|
tags:
|
||||||
- imio
|
- imio
|
||||||
|
|
||||||
- hosts: visio.nereide.fr
|
- hosts: jitsi.komuniki.fr
|
||||||
roles:
|
roles:
|
||||||
- role: jitsi-pre-install
|
- role: jitsi-pre-install
|
||||||
- role: jitsi-install
|
- role: jitsi-install
|
||||||
- role: jitsi-enable-LE
|
- role: jitsi-enable-prejoinPage
|
||||||
- role: jitsi-enable-stats
|
- role: jitsi-enable-stats
|
||||||
- role: jitsi-enable-fr-ln
|
- role: jitsi-enable-fr-ln
|
||||||
- role: jitsi-enable-video-optimisation
|
- role: jitsi-enable-video-optimisation
|
||||||
- role: jitsi-add-logo
|
- role: jitsi-add-logo
|
||||||
|
- role: jitsi-enable-calendar
|
||||||
tags:
|
tags:
|
||||||
- nrd
|
- komki
|
||||||
|
|
||||||
- hosts: visio443.champs-libres.be
|
- hosts: visio443.champs-libres.be
|
||||||
roles:
|
roles:
|
||||||
- role: jitsi-pre-install
|
- role: jitsi-pre-install
|
||||||
- role: jitsi-install
|
- role: jitsi-install
|
||||||
- role: jitsi-enable-LE
|
|
||||||
- role: jitsi-enable-fr-ln
|
- role: jitsi-enable-fr-ln
|
||||||
- role: jitsi-enable-video-optimisation
|
- role: jitsi-enable-video-optimisation
|
||||||
- role: jitsi-enable-stats
|
- role: jitsi-enable-stats
|
||||||
@@ -39,7 +38,6 @@
|
|||||||
- hosts: jitsi.entrouvert.com
|
- hosts: jitsi.entrouvert.com
|
||||||
roles:
|
roles:
|
||||||
- role: jitsi-pre-install
|
- role: jitsi-pre-install
|
||||||
- role: jitsi-enable-LE
|
|
||||||
- role: jitsi-enable-fr-ln
|
- role: jitsi-enable-fr-ln
|
||||||
- role: jitsi-enable-video-optimisation
|
- role: jitsi-enable-video-optimisation
|
||||||
tags:
|
tags:
|
||||||
|
|||||||
+8
-33
@@ -1,39 +1,14 @@
|
|||||||
#Roles possible:
|
#Roles possible: cf dossier roles
|
||||||
# - role: jitsi-pre-install
|
|
||||||
# - role: jitsi-install
|
|
||||||
# - role: jitsi-enable-LE
|
|
||||||
# - role: jitsi-enable-fr-ln
|
|
||||||
# - role: jitsi-enable-video-optimisation
|
|
||||||
# - role: jitsi-enable-stats
|
|
||||||
# - role: jitsi-enable-auth
|
|
||||||
|
|
||||||
---
|
---
|
||||||
- hosts: pp.visio.nereide.fr
|
- hosts: pp.visio.nereide.fr
|
||||||
roles:
|
roles:
|
||||||
|
- role: jitsi-pre-install
|
||||||
|
- role: jitsi-install
|
||||||
|
- role: jitsi-enable-prejoinPage
|
||||||
|
- role: jitsi-add-logo
|
||||||
|
- role: jitsi-enable-fr-ln
|
||||||
|
- role: jitsi-enable-video-optimisation
|
||||||
- role: jitsi-enable-stats
|
- role: jitsi-enable-stats
|
||||||
|
- role: jitsi-enable-calendar
|
||||||
tags:
|
tags:
|
||||||
- ppnrd
|
- ppnrd
|
||||||
|
|
||||||
- hosts: pp.visio.nereide.fr
|
|
||||||
roles:
|
|
||||||
- role: jitsi-enable-LE
|
|
||||||
- role: jitsi-enable-fr-ln
|
|
||||||
- role: jitsi-enable-video-optimisation
|
|
||||||
- role: jitsi-enable-stats
|
|
||||||
tags:
|
|
||||||
- ppnrd-post-install
|
|
||||||
|
|
||||||
- hosts: pp.imio.nereide.fr
|
|
||||||
roles:
|
|
||||||
- role: jitsi-pre-install
|
|
||||||
tags:
|
|
||||||
- ppimio-pre-install
|
|
||||||
|
|
||||||
- hosts: pp.imio.nereide.fr
|
|
||||||
roles:
|
|
||||||
- role: jitsi-enable-LE
|
|
||||||
- role: jitsi-enable-fr-ln
|
|
||||||
- role: jitsi-enable-video-optimisation
|
|
||||||
- role: jitsi-enable-stats
|
|
||||||
tags:
|
|
||||||
- ppimio-post-install
|
|
||||||
@@ -0,0 +1,135 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="124.8466mm"
|
||||||
|
height="114.23556mm"
|
||||||
|
viewBox="0 0 124.8466 114.23556"
|
||||||
|
version="1.1"
|
||||||
|
id="svg8"
|
||||||
|
inkscape:version="0.92.3 (2405546, 2018-03-11)"
|
||||||
|
sodipodi:docname="logo-visio.svg">
|
||||||
|
<defs
|
||||||
|
id="defs2" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="0.590625"
|
||||||
|
inkscape:cx="367.56452"
|
||||||
|
inkscape:cy="323.51278"
|
||||||
|
inkscape:document-units="mm"
|
||||||
|
inkscape:current-layer="layer1"
|
||||||
|
showgrid="false"
|
||||||
|
inkscape:window-width="1853"
|
||||||
|
inkscape:window-height="1025"
|
||||||
|
inkscape:window-x="67"
|
||||||
|
inkscape:window-y="27"
|
||||||
|
inkscape:window-maximized="1"
|
||||||
|
showguides="false"
|
||||||
|
inkscape:guide-bbox="true"
|
||||||
|
fit-margin-top="0"
|
||||||
|
fit-margin-left="0"
|
||||||
|
fit-margin-right="0"
|
||||||
|
fit-margin-bottom="0">
|
||||||
|
<sodipodi:guide
|
||||||
|
position="115.06012,195.22499"
|
||||||
|
orientation="1,0"
|
||||||
|
id="guide982"
|
||||||
|
inkscape:locked="false" />
|
||||||
|
</sodipodi:namedview>
|
||||||
|
<metadata
|
||||||
|
id="metadata5">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title></dc:title>
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
inkscape:label="Calque 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"
|
||||||
|
transform="translate(-59.951922,-123.78641)">
|
||||||
|
<path
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:0.87112886;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="m 708.41864,110.70981 0.88815,-8.00777"
|
||||||
|
id="path945-3-1"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="cc" />
|
||||||
|
<g
|
||||||
|
id="g1403">
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="scccccssss"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path2-4"
|
||||||
|
d="m 86.469777,153.32677 c -7.03899,0 -12.77855,5.73956 -12.77855,12.77855 0,47.5899 -0.0372,44.00704 -0.0372,69.57094 -0.0132,1.91436 2.16198,3.02418 3.70262,1.88774 l 21.78317,-16.0507 69.770423,0.22324 c 7.03894,0.0225 12.77803,-5.73903 12.77803,-12.77803 v -42.85319 c 0,-7.03899 -5.73905,-12.77855 -12.77803,-12.77855 z"
|
||||||
|
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;vector-effect:none;fill:#807bff;fill-opacity:1;stroke:none;stroke-width:4.64664698;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="scccccssss"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path2-2-5"
|
||||||
|
d="m 80.119777,146.97677 c -7.03899,0 -12.77855,5.73956 -12.77855,12.77854 0,47.58991 -0.0372,44.00705 -0.0372,69.57094 -0.0132,1.91436 2.16198,3.02418 3.70262,1.88774 l 21.78317,-16.05069 69.770413,0.22324 c 7.03894,0.0225 12.77803,-5.73903 12.77803,-12.77803 v -42.8532 c 0,-7.03898 -5.73905,-12.77854 -12.77803,-12.77854 z"
|
||||||
|
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.8;vector-effect:none;fill:#45ffac;fill-opacity:1;stroke:none;stroke-width:4.64664698;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
|
||||||
|
<g
|
||||||
|
id="g1004-8"
|
||||||
|
transform="translate(-4.8445766,118.65683)">
|
||||||
|
<path
|
||||||
|
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.32291663;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
|
||||||
|
d="m 112.2877,91.322831 h 48.91818 c 7.03894,0 12.77825,-5.739304 12.77825,-12.778294 v -42.8531 c 0,-7.03899 -5.73931,-12.77825 -12.77825,-12.77825 H 78.236247 c -7.038991,0 -12.77829,5.73926 -12.77829,12.77825 0,29.46775 0.491596,41.2963 0.491596,55.631394 v 13.939909 c -0.0132,1.91432 2.1622,3.02416 3.7028,1.88771 L 91.723954,90.887204 c 2.51762,-1.839237 2.517488,-1.839277 0,0"
|
||||||
|
id="path2-7-4"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="cssssscccccc" />
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
id="g1181-0"
|
||||||
|
transform="matrix(0.01547418,1.1956516,-1.1956516,0.01547418,-3.642961,-185.95034)"
|
||||||
|
style="stroke-width:1.10634732;stroke-miterlimit:4;stroke-dasharray:none">
|
||||||
|
<path
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.10634732;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||||
|
d="m 281.88247,-153.39664 1.32484,6.14029"
|
||||||
|
id="path1100-9-8"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path1102-9-4"
|
||||||
|
d="m 272.51203,-149.70665 3.26675,5.25591"
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.10634732;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
inkscape:transform-center-y="-1.4559083"
|
||||||
|
inkscape:transform-center-x="-0.55996473"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path1102-5-78-2"
|
||||||
|
d="m 265.42103,-142.39599 5.24153,3.28979"
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.10634732;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
<path
|
||||||
|
inkscape:transform-center-y="-1.5592883"
|
||||||
|
inkscape:transform-center-x="0.04300527"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path1102-5-7-2-5"
|
||||||
|
d="m 261.33243,-132.80313 6.10359,1.02103"
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:1.10634732;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
|
||||||
|
</g>
|
||||||
|
<path
|
||||||
|
style="fill:#ffffff;stroke-width:0.64484543"
|
||||||
|
sodipodi:nodetypes="ccsscsccscccccccssssssssssss"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path2-9"
|
||||||
|
d="m 117.6408,170.58258 c -0.39658,-0.26502 -1.06658,-0.28953 -1.48507,-0.0645 -0.41916,0.22495 -0.84217,0.66227 -0.84217,1.13752 v 15.47629 c 0,0.47526 0.42301,0.91244 0.8428,1.13749 0.19024,0.10192 0.48041,0.15209 0.6887,0.15209 0.2502,0 0.53973,-0.0728 0.75576,-0.21667 l 11.62721,-7.73814 c 0.35917,-0.23934 0.58422,-0.64162 0.58422,-1.07301 0,-0.4314 -0.2102,-0.8338 -0.56939,-1.07303 z m 0.25214,14.13954 v -10.65674 l 7.99285,5.32838 -2.30889,1.53919 z m 2.9018,11.4376 c -9.24515,0 -16.76599,-7.52081 -16.76599,-16.76596 0,-9.24514 7.52084,-16.76599 16.76599,-16.76599 9.24515,0 16.76597,7.52085 16.76597,16.76599 0,0.71191 0.57715,1.28967 1.2897,1.28967 0.71256,0 1.28969,-0.57776 1.28969,-1.28967 0,-10.66704 -8.67833,-19.34536 -19.34536,-19.34536 -10.66704,0 -19.34536,8.67832 -19.34536,19.34536 0,7.34432 4.11388,13.74593 10.15829,17.02141 2.7346,1.4819 5.86435,2.32395 9.18707,2.32395 0.71191,0 1.28968,-0.57713 1.28968,-1.2897 0,-0.71254 -0.57777,-1.2897 -1.28968,-1.2897 z" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 8.6 KiB |
@@ -3,12 +3,14 @@
|
|||||||
template:
|
template:
|
||||||
src: ../files/{{ jitsi_logo }}
|
src: ../files/{{ jitsi_logo }}
|
||||||
dest: /usr/share/jitsi-meet/images/
|
dest: /usr/share/jitsi-meet/images/
|
||||||
|
mode: u=rw,g=r,o=r
|
||||||
|
|
||||||
- name: Modif du css pour appliquer le nouveau logo
|
- name: Application du logo si déclaré dans les variables
|
||||||
replace:
|
lineinfile:
|
||||||
path: /usr/share/jitsi-meet/css/all.css
|
path: /usr/share/jitsi-meet/interface_config.js
|
||||||
regexp: 'watermark.png'
|
regexp: "DEFAULT_LOGO_URL: "
|
||||||
replace: "{{ jitsi_logo }}"
|
line: "DEFAULT_LOGO_URL: 'images/{{ jitsi_logo }}',"
|
||||||
|
when: jitsi_logo is defined
|
||||||
|
|
||||||
- name: Application de l'url si déclaré dans les variables
|
- name: Application de l'url si déclaré dans les variables
|
||||||
lineinfile:
|
lineinfile:
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
---
|
|
||||||
- name: Conf let's encrypt - désactivation de la demande du mail de supervision
|
|
||||||
replace:
|
|
||||||
path: /usr/share/jitsi-meet/scripts/install-letsencrypt-cert.sh
|
|
||||||
regexp: "^read EMAIL"
|
|
||||||
replace: |
|
|
||||||
#read EMAIL
|
|
||||||
EMAIL=supervision@nereide.fr
|
|
||||||
|
|
||||||
- name: Exécution du script lets encrypt
|
|
||||||
shell: /usr/share/jitsi-meet/scripts/install-letsencrypt-cert.sh >> jitsi-le.log
|
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
---
|
||||||
|
- name: Conf Jitsi - Activation de la connexion au google calendar
|
||||||
|
blockinfile:
|
||||||
|
path: /etc/jitsi/meet/{{ inventory_hostname }}-config.js
|
||||||
|
marker: "// {mark} ANSIBLE MANAGED BLOCK CALENDAR"
|
||||||
|
insertafter: "[^?]// enableCalendarIntegration: false,"
|
||||||
|
block: |
|
||||||
|
enableCalendarIntegration: true,
|
||||||
|
googleApiApplicationClientID: "{{ vault_google_api_client_id }}",
|
||||||
@@ -1,10 +1,4 @@
|
|||||||
---
|
---
|
||||||
- name: Conf Jitsi - UI en fr
|
|
||||||
lineinfile:
|
|
||||||
path: /etc/jitsi/meet/{{ inventory_hostname }}-config.js
|
|
||||||
insertafter: "[^?]// defaultLanguage: 'en'"
|
|
||||||
line: " defaultLanguage: 'fr',"
|
|
||||||
|
|
||||||
- name: Conf Jitsi - UI en fr
|
- name: Conf Jitsi - UI en fr
|
||||||
lineinfile:
|
lineinfile:
|
||||||
path: /usr/share/jitsi-meet/interface_config.js
|
path: /usr/share/jitsi-meet/interface_config.js
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
- name: Conf Jitsi - Activation de la page de pré-connexion a la room
|
||||||
|
lineinfile:
|
||||||
|
path: /etc/jitsi/meet/{{ inventory_hostname }}-config.js
|
||||||
|
insertafter: "[^?]// prejoinPageEnabled: false,"
|
||||||
|
line: " prejoinPageEnabled: true,"
|
||||||
@@ -42,20 +42,14 @@
|
|||||||
template:
|
template:
|
||||||
src: ../templates/telegraf-input-jitsi.conf
|
src: ../templates/telegraf-input-jitsi.conf
|
||||||
dest: /etc/telegraf/telegraf.d/jitsi.conf
|
dest: /etc/telegraf/telegraf.d/jitsi.conf
|
||||||
|
mode: u=rw,g=r,o=r
|
||||||
notify:
|
notify:
|
||||||
- restart telegraf
|
- restart telegraf
|
||||||
|
|
||||||
- name: Question
|
|
||||||
pause:
|
|
||||||
prompt: "Vers quel influxdb/grafana souhaitez vous envoyer les metrics?\n1- Néréide\n2- Champs-Libres\n"
|
|
||||||
register: prompt_input
|
|
||||||
|
|
||||||
- name: Application de la conf Telegraf
|
- name: Application de la conf Telegraf
|
||||||
vars:
|
|
||||||
outputnrd: prompt_input.user_input == "1"
|
|
||||||
outputcl: prompt_input.user_input == "2"
|
|
||||||
template:
|
template:
|
||||||
src: ../templates/telegraf-general.conf.j2
|
src: ../templates/telegraf-general.conf.j2
|
||||||
dest: /etc/telegraf/telegraf.conf
|
dest: /etc/telegraf/telegraf.conf
|
||||||
|
mode: u=rw,g=r,o=r
|
||||||
notify:
|
notify:
|
||||||
- restart telegraf
|
- restart telegraf
|
||||||
|
|||||||
@@ -21,11 +21,12 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
[[outputs.influxdb]]
|
[[outputs.influxdb]]
|
||||||
{% if outputnrd %}
|
|
||||||
urls = [ "https://influxdb.nereide.fr" ]
|
urls = [ "https://influxdb.nereide.fr" ]
|
||||||
username = "telegraf"
|
username = "telegraf"
|
||||||
password = "{{ vault_telegraf_nrd_passwd }}"
|
password = "{{ vault_telegraf_nrd_passwd }}"
|
||||||
{% elif outputcl %}
|
|
||||||
|
{% if "visio.imio.be" == inventory_hostname %}
|
||||||
|
[[outputs.influxdb]]
|
||||||
urls = [ "https://influxdb.gra1.metrics.ovh.net" ]
|
urls = [ "https://influxdb.gra1.metrics.ovh.net" ]
|
||||||
username = "metrics"
|
username = "metrics"
|
||||||
password = "{{ vault_telegraf_cl_passwd }}"
|
password = "{{ vault_telegraf_cl_passwd }}"
|
||||||
@@ -35,14 +36,27 @@
|
|||||||
# INPUTS #
|
# INPUTS #
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
[[inputs.processes]]
|
|
||||||
[[inputs.cpu]]
|
[[inputs.cpu]]
|
||||||
percpu = false
|
percpu = true
|
||||||
|
totalcpu = true
|
||||||
|
fielddrop = ["time_*"]
|
||||||
|
|
||||||
[[inputs.disk]]
|
[[inputs.disk]]
|
||||||
interval = "3600s"
|
ignore_fs = ["tmpfs", "devtmpfs", "none", "iso9660", "overlay", "aufs", "squashfs"]
|
||||||
ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"]
|
|
||||||
fielddrop = ["total","used","inodes_free","inodes_total","inodes_used"]
|
[[inputs.diskio]]
|
||||||
|
|
||||||
|
[[inputs.kernel]]
|
||||||
|
|
||||||
[[inputs.mem]]
|
[[inputs.mem]]
|
||||||
fielddrop=["buffered","cached","slab","available_percent","used_percent","wired","commit_limit","commited_as","dirty","high_free","high_total","huge_page_size","huge_pages_free","huge_pages_total","low_free","low_total","mapped","page_tables","shared","sreclaimable","sunreclaim","swap_total","vmalloc_chunk","vmalloc_total","vmalloc_used","write_back","write_back_tmp"]
|
|
||||||
|
[[inputs.swap]]
|
||||||
|
|
||||||
|
[[inputs.net]]
|
||||||
|
fieldpass = [ "bytes*" ]
|
||||||
|
|
||||||
|
[[inputs.netstat]]
|
||||||
|
|
||||||
|
[[inputs.processes]]
|
||||||
|
|
||||||
[[inputs.system]]
|
[[inputs.system]]
|
||||||
fielddrop=["n_users","uptime_format","uptime","n_cpus"]
|
|
||||||
|
|||||||
@@ -2,3 +2,16 @@
|
|||||||
- name: installation de jitsi
|
- name: installation de jitsi
|
||||||
apt:
|
apt:
|
||||||
name: jitsi-meet
|
name: jitsi-meet
|
||||||
|
|
||||||
|
- name: Conf let's encrypt - désactivation de la demande du mail de supervision
|
||||||
|
replace:
|
||||||
|
path: /usr/share/jitsi-meet/scripts/install-letsencrypt-cert.sh
|
||||||
|
regexp: "^read EMAIL"
|
||||||
|
replace: |
|
||||||
|
#read EMAIL
|
||||||
|
EMAIL=supervision@nereide.fr
|
||||||
|
|
||||||
|
- name: Exécution du script lets encrypt
|
||||||
|
shell:
|
||||||
|
cmd: /usr/share/jitsi-meet/scripts/install-letsencrypt-cert.sh >> jitsi-le.log
|
||||||
|
removes: /etc/letsencrypt/live/jitsi.komuniki.fr/fullchain.pem
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
---
|
---
|
||||||
- name: Installation de fail2ban, nftables, gnupg2, apt-transport-https
|
- name: Installation de fail2ban, nftables, gnupg2, apt-transport-https, ufw
|
||||||
apt:
|
apt:
|
||||||
name:
|
name:
|
||||||
- fail2ban
|
- fail2ban
|
||||||
- nftables
|
- nftables
|
||||||
- gnupg2
|
- gnupg2
|
||||||
- apt-transport-https
|
- apt-transport-https
|
||||||
|
- ufw
|
||||||
update_cache: true
|
update_cache: true
|
||||||
state: present
|
state: present
|
||||||
|
|
||||||
@@ -36,6 +37,20 @@
|
|||||||
- restart nftables
|
- restart nftables
|
||||||
- restart fail2ban
|
- restart fail2ban
|
||||||
|
|
||||||
|
- name: Mise en place des règle firewall tcp et udp
|
||||||
|
#source : https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-quickstart#setup-and-configure-your-firewall
|
||||||
|
ufw:
|
||||||
|
state: enabled
|
||||||
|
rule: allow
|
||||||
|
port: '{{ item[0] }}'
|
||||||
|
proto: '{{ item[1] }}'
|
||||||
|
loop:
|
||||||
|
- ['80','tcp']
|
||||||
|
- ['443','tcp']
|
||||||
|
- ['4443','tcp']
|
||||||
|
- ['22','tcp']
|
||||||
|
- ['10000','udp']
|
||||||
|
|
||||||
- name: Ajout de la clé GPG pour le depot jitsi
|
- name: Ajout de la clé GPG pour le depot jitsi
|
||||||
apt_key:
|
apt_key:
|
||||||
url: http://download.jitsi.org/jitsi-key.gpg.key
|
url: http://download.jitsi.org/jitsi-key.gpg.key
|
||||||
|
|||||||
Reference in New Issue
Block a user