Compare commits
No commits in common. "master" and "monitoring" have entirely different histories.
master
...
monitoring
44 changed files with 1136 additions and 416 deletions
18
.gitmodules
vendored
18
.gitmodules
vendored
|
@ -1,18 +0,0 @@
|
||||||
[submodule "roles/matrix-bridge-discord"]
|
|
||||||
path = roles/matrix-bridge-discord
|
|
||||||
url = ssh://git@gitea.auro.re:2222/Pains-Perdus/matrix-bridge-discord.git
|
|
||||||
[submodule "roles/matrix-bridge-facebook"]
|
|
||||||
path = roles/matrix-bridge-facebook
|
|
||||||
url = ssh://git@gitea.auro.re:2222/Pains-Perdus/matrix-bridge-facebook.git
|
|
||||||
[submodule "roles/matrix-bridge-signal"]
|
|
||||||
path = roles/matrix-bridge-signal
|
|
||||||
url = ssh://git@gitea.auro.re:2222/Pains-Perdus/matrix-bridge-signal.git
|
|
||||||
[submodule "roles/matrix-bridge-instagram"]
|
|
||||||
path = roles/matrix-bridge-instagram
|
|
||||||
url = ssh://git@gitea.auro.re:2222/Pains-Perdus/matrix-bridge-instagram.git
|
|
||||||
[submodule "roles/postgre"]
|
|
||||||
path = roles/postgre
|
|
||||||
url = ssh://git@gitea.auro.re:2222/Pains-Perdus/postgre.git
|
|
||||||
[submodule "roles/matrix-bridge-telegram"]
|
|
||||||
path = roles/matrix-bridge-telegram
|
|
||||||
url = ssh://git@gitea.auro.re:2222/Pains-Perdus/matrix-bridge-telegram.git
|
|
0
books/apt_proxy.yml
Executable file → Normal file
0
books/apt_proxy.yml
Executable file → Normal file
0
books/base.yml
Executable file → Normal file
0
books/base.yml
Executable file → Normal file
0
books/dns.yml
Executable file → Normal file
0
books/dns.yml
Executable file → Normal file
0
books/gitea.yml
Executable file → Normal file
0
books/gitea.yml
Executable file → Normal file
0
books/keycloak.yml
Executable file → Normal file
0
books/keycloak.yml
Executable file → Normal file
3
books/matrix.yml
Executable file → Normal file
3
books/matrix.yml
Executable file → Normal file
|
@ -5,9 +5,6 @@
|
||||||
- synapse
|
- synapse
|
||||||
- matrix-bridge-discord
|
- matrix-bridge-discord
|
||||||
- matrix-bridge-facebook
|
- matrix-bridge-facebook
|
||||||
- matrix-bridge-signal
|
|
||||||
- matrix-bridge-instagram
|
|
||||||
- matrix-bridge-telegram
|
|
||||||
|
|
||||||
- hosts: proxy
|
- hosts: proxy
|
||||||
roles:
|
roles:
|
||||||
|
|
0
books/monitoring.yml
Executable file → Normal file
0
books/monitoring.yml
Executable file → Normal file
0
books/users.yml
Executable file → Normal file
0
books/users.yml
Executable file → Normal file
0
books/vpn.yml
Executable file → Normal file
0
books/vpn.yml
Executable file → Normal file
0
books/web_services.yml
Executable file → Normal file
0
books/web_services.yml
Executable file → Normal file
|
@ -11,9 +11,6 @@ matrix_form_secret: "{{ vault_matrix_form_secret }}"
|
||||||
matrix_apps_services:
|
matrix_apps_services:
|
||||||
- discord
|
- discord
|
||||||
- facebook
|
- facebook
|
||||||
- signal
|
|
||||||
- instagram
|
|
||||||
- telegram
|
|
||||||
|
|
||||||
# bridge discord
|
# bridge discord
|
||||||
matrix_bridge_discord_postgre_user_pwd: "{{ vault_matrix_bridge_discord_postgre_user_pwd }}"
|
matrix_bridge_discord_postgre_user_pwd: "{{ vault_matrix_bridge_discord_postgre_user_pwd }}"
|
||||||
|
@ -25,41 +22,13 @@ matrix_bridge_facebook_postgre_user_pwd: "{{ vault_matrix_bridge_facebook_postgr
|
||||||
# Those values are generated by the bridge the first time the bridge is launched.
|
# Those values are generated by the bridge the first time the bridge is launched.
|
||||||
# we copied the values generated from our test config
|
# we copied the values generated from our test config
|
||||||
matrix_bridge_facebook_integration_manager_shared_secret: "{{ vault_matrix_bridge_facebook_integration_manager_shared_secret }}"
|
matrix_bridge_facebook_integration_manager_shared_secret: "{{ vault_matrix_bridge_facebook_integration_manager_shared_secret }}"
|
||||||
# matrix_bridge_facebook_as_token: "{{ vault_matrix_bridge_facebook_as_token }}"
|
matrix_bridge_facebook_as_token: "{{ vault_matrix_bridge_facebook_as_token }}"
|
||||||
# matrix_bridge_facebook_hs_token: "{{ vault_matrix_bridge_facebook_hs_token }}"
|
matrix_bridge_facebook_hs_token: "{{ vault_matrix_bridge_facebook_hs_token }}"
|
||||||
matrix_bridge_facebook_admins:
|
matrix_bridge_facebook_admins:
|
||||||
- g33kex
|
- g33kex
|
||||||
- histausse
|
- histausse
|
||||||
matrix_bridge_facebook_allowed_external_user:
|
matrix_bridge_facebook_allowed_external_user:
|
||||||
- '@dorianx:matrix.rezel.net'
|
- '@dorianx:matrix.rezel.net'
|
||||||
|
|
||||||
# bridge signal
|
|
||||||
matrix_bridge_signal_postgre_user_pwd: "{{ vault_matrix_bridge_signal_postgre_user_pwd }}"
|
|
||||||
matrix_bridge_signal_admins:
|
|
||||||
- g33kex
|
|
||||||
- histausse
|
|
||||||
matrix_bridge_signal_allowed_external_user:
|
|
||||||
- '@dorianx:matrix.rezel.net'
|
|
||||||
|
|
||||||
# bridge instagram
|
|
||||||
matrix_bridge_instagram_postgre_user_pwd: "{{ vault_matrix_bridge_instagram_postgre_user_pwd }}"
|
|
||||||
matrix_bridge_instagram_admins:
|
|
||||||
- g33kex
|
|
||||||
- histausse
|
|
||||||
matrix_bridge_instagram_allowed_external_user:
|
|
||||||
- '@dorianx:matrix.rezel.net'
|
|
||||||
|
|
||||||
# bridge telegram
|
|
||||||
matrix_bridge_telegram_postgre_user_pwd: "{{ vault_matrix_bridge_telegram_postgre_user_pwd }}"
|
|
||||||
matrix_bridge_telegram_admins:
|
|
||||||
- g33kex
|
|
||||||
- histausse
|
|
||||||
matrix_bridge_telegram_allowed_external_user:
|
|
||||||
- '@dorianx:matrix.rezel.net'
|
|
||||||
matrix_bridge_telegram_api_id: "{{ vault_matrix_bridge_telegram_api_id }}"
|
|
||||||
matrix_bridge_telegram_api_hash: "{{ vault_matrix_bridge_telegram_api_hash }}"
|
|
||||||
matrix_bridge_telegram_bot_token: "{{ vault_matrix_bridge_telegram_bot_token }}"
|
|
||||||
|
|
||||||
# Not configured for now
|
# Not configured for now
|
||||||
matrix_stats_endpoint: https://127.0.0.1/report-usage-stats/push
|
matrix_stats_endpoint: https://127.0.0.1/report-usage-stats/push
|
||||||
|
|
||||||
|
|
|
@ -18,11 +18,21 @@ intranet:
|
||||||
ipv4: 172.20.1.1
|
ipv4: 172.20.1.1
|
||||||
netmaskv4: 32
|
netmaskv4: 32
|
||||||
comment: Hindley
|
comment: Hindley
|
||||||
router_hellman:
|
azerty:
|
||||||
domaine: 'router-hellman'
|
domaine: azerty
|
||||||
|
ipv4: 172.20.1.2
|
||||||
|
netmaskv4: 32
|
||||||
|
comment: Azerty
|
||||||
|
hellman:
|
||||||
|
domaine: hellman
|
||||||
ipv4: 172.20.1.3
|
ipv4: 172.20.1.3
|
||||||
netmaskv4: 32
|
netmaskv4: 32
|
||||||
comment: Router on Hellman
|
comment: Hellman
|
||||||
|
rossum:
|
||||||
|
domaine: rossum
|
||||||
|
ipv4: 172.20.1.4
|
||||||
|
netmaskv4: 32
|
||||||
|
comment: Rossum
|
||||||
matrix:
|
matrix:
|
||||||
domaine: matrix
|
domaine: matrix
|
||||||
ipv4: 172.20.1.5
|
ipv4: 172.20.1.5
|
||||||
|
@ -30,21 +40,42 @@ intranet:
|
||||||
comment: Matrix server
|
comment: Matrix server
|
||||||
guest_hellman:
|
guest_hellman:
|
||||||
domaine: hllm
|
domaine: hllm
|
||||||
ipv4: 172.20.198.0
|
ipv4: 172.20.103.0
|
||||||
netmaskv4: 24
|
netmaskv4: 24
|
||||||
gateway: 172.20.198.1
|
gateway: 172.20.103.1
|
||||||
comment: Lan for the vm hosted on hellman
|
comment: Lan for the vm hosted on hellman
|
||||||
subnets:
|
subnets:
|
||||||
hellman:
|
hellman:
|
||||||
domaine: router
|
domaine: hellman
|
||||||
ipv4: 172.20.198.1
|
ipv4: 172.20.103.1
|
||||||
netmaskv4: 32
|
netmaskv4: 32
|
||||||
comment: Router
|
comment: Hellman
|
||||||
test:
|
test:
|
||||||
domaine: test
|
domaine: test
|
||||||
ipv4: 172.20.199.0
|
ipv4: 172.20.199.0
|
||||||
netmaskv4: 24
|
netmaskv4: 24
|
||||||
comment: Test VM
|
comment: Test VM
|
||||||
|
subnets:
|
||||||
|
vm1:
|
||||||
|
domaine: vm1
|
||||||
|
ipv4: 172.20.199.1
|
||||||
|
netmaskv4: 32
|
||||||
|
comment: Test vm 1, on knuth
|
||||||
|
vm2:
|
||||||
|
domaine: vm2
|
||||||
|
ipv4: 172.20.199.2
|
||||||
|
netmaskv4: 32
|
||||||
|
comment: Test vm 2, on knuth
|
||||||
|
vm3:
|
||||||
|
domaine: vm3
|
||||||
|
ipv4: 172.20.199.3
|
||||||
|
netmaskv4: 32
|
||||||
|
comment: Test vm 3, on knuth
|
||||||
|
vm4:
|
||||||
|
domaine: vm4
|
||||||
|
ipv4: 172.20.199.4
|
||||||
|
netmaskv4: 32
|
||||||
|
comment: Test vm 4, on knuth
|
||||||
guest:
|
guest:
|
||||||
domaine: guest
|
domaine: guest
|
||||||
ipv4: 172.20.200.0
|
ipv4: 172.20.200.0
|
||||||
|
|
|
@ -1,305 +1,272 @@
|
||||||
$ANSIBLE_VAULT;1.1;AES256
|
$ANSIBLE_VAULT;1.1;AES256
|
||||||
66396364626137653230336236313132366334386632383339303335333062323833373534643931
|
66653939356531646231633866643664343439626466393835366664643239356166353639656466
|
||||||
3035323936343830646136386237623565303262616366320a303665383565613936323763383538
|
3731653736323063643664616534393834666637623438610a653265313233663738326166366234
|
||||||
32373832626130636665313664356636623339353266656433366563366439363764386136616537
|
64393862363239636533343139663166643331363133343230633032656633663033313032353630
|
||||||
6230376436363463620a663761633130383262353661313461343839656361356238376433396639
|
3666666439346332350a323239376135383262376661366632363963303433666362316535323664
|
||||||
36643034376539383136633937613031343862653739396536346130303164346465356530323564
|
31336635356137646565396131396461653630363362356638346266316231383036323632653366
|
||||||
38396130343031343862383237383566333661623466353538343462343565373765316132666430
|
33323430663863346664653562326330376639623131323936386639303065313738356665613535
|
||||||
32393635623834343566303932343734653566326231303531346662303436653437663034333865
|
64633663393963666363336265383661366264643931313939666561646134303130353034376530
|
||||||
65666230623861393161353339336663616131393830333136373366626233363966613064656630
|
63383064373633326263383332303632316135353862333365326439636131366165663636626337
|
||||||
65663362636566323263353838393932343036613337383533393838636338393738303835666538
|
63383566653331346536626138653733613666356162336163643566623737653337396436313134
|
||||||
34373266393237326465613064656231616562626531353937653565346634646162653038356566
|
36343535363331366463306335386465643464336339663933323733396437663332303231363237
|
||||||
37643364336562643439616464636536353335666162623831313035663039386637323639623035
|
39313663656136336466393737323965336430306437336530306361343631396132653230353137
|
||||||
66653538646665306130393934333732346366366439396637313932366463343935303264613033
|
64316538373532333332643638613736393661336565346364313961613736383063316433623634
|
||||||
64633162373062373534643938646633306332303064356662366163366366326561656266636234
|
62373137326336663236323463313462313739666162386333653235373763356335393039356638
|
||||||
36613630346162353061313532386330653939373663616534653263306339633139653935663565
|
64646131313930313438613264303535633137663662613163653165393835303032366462326564
|
||||||
31316237373766653865326632306232346234613237643038613334353737323930636365303562
|
33386134636231353762363563313137626134393563383838313834396235346364303731653136
|
||||||
63333261646638633031313032386239383938386439376333613762346237313463643663336133
|
34363964386165323561633138306137613632616437643632656334653138373330346434386262
|
||||||
36353833333661323632633461333064313263323937613263356264366539313036366637646138
|
65383662366135613939393266633062663665303935663634313735663361333862356565393265
|
||||||
63373761626566613732623365643065626234643032323263623965316464343734386532333165
|
33373036623232663830623962363139626436616339393863326130333163353038373530643566
|
||||||
37626561616334396561333930326461393863346139663738393536626135386463366366396336
|
33393733623635333931363932376663613364393832646231616133366264646230633033643062
|
||||||
36306538373331616562373263653636643938643031386435633234666561353164386463323339
|
37336335383732613837303035376563653638306437393336383565623264316166653437386432
|
||||||
63353761653538663264333762613731336333656139313434613563343061386462643535346533
|
61336433316531346636356262313534653037336139633839613163356365643466636662616462
|
||||||
65366263383735306336386430636338396561346236333837336465323866333933333337626235
|
35323135636337353930636463613437326538303736643262663262633330396663303064313933
|
||||||
39653030326430663332636263333938326536356366643734346362643430336366623164633330
|
32346437643938303265353363353735373862383761326333306138386266363566386336366436
|
||||||
65383838383830306133626461643632656637336264666638383636376565666231373331393834
|
32386436323564323964346332313363373534626162613033363564646264376662323366353939
|
||||||
38663939633137363236303632616638646238313431653262346437313237356263616530656339
|
64303663383031613634333333353563333761363134393637633031306561373339663031366466
|
||||||
34336634386133383434623739326234313339333265636364373963343334363836313934653565
|
63396634396535366461396262663739383861656461383435323936636166623862663130356630
|
||||||
64336132376336323063663765643365336366303732666137376631323231343631656439383666
|
33646365343564633662663438613338356131383638363930626338393739326336396361356232
|
||||||
36383535316232636434653238313738653166633836303461376232333933316332326462656432
|
34366363646432316431656439656136633838663066626436383238323165393836386636373039
|
||||||
39313166396234613162623361343037383131663465383438356438663130306138356266656561
|
64653930666334326237363261666364663531623535373265623638396334636439346465313238
|
||||||
37306232653730653962656336373634643937333633623361343132393964623739623161373233
|
64356335313731353939313364363534393762616634326262653366303234633338626661663165
|
||||||
35373461303833343666623261616534323435663634363639316466613761616533646531616635
|
36346430326431656639346161363861396438626661663930396334646339663333366535303438
|
||||||
37663038396537343361393635343264613635666564343065313930376365393361363934643234
|
65346136396334376530366438613737386535353431396531316265393036623430383735623237
|
||||||
34663830386664613062626465633666616430646566633435303837623536646466616337376162
|
64663634666564656633643462653962386332623539623933653966323066376536386463336361
|
||||||
39376431643738336163653333333638663564356237393630636537306564333531336330333039
|
32353732663366643438343862613863373564383638336332353039643833653563396136626131
|
||||||
61386261316335323866353637626536363939346564373333633561323361396264373034353063
|
63306635386163313131623738363533313131613537363735333337323334353462383039336433
|
||||||
33613835393064393363326263623964353131326566353938623431396566663961633863313465
|
66636137356462383538303336363439313938666165366434333030396561613833613539383737
|
||||||
37373264343331333839356538346436336561656435643434353532626539333538343261616336
|
33613332633763343865363034653730336364653461666331353837653637663139306366313663
|
||||||
66623432653930633334363266316339373830643631316432303633633337666537373039323037
|
61633133633563353132643066366633626435303363616661353138343363363139386232386464
|
||||||
62316333356438346364663734613863316334636365316565336561626563373266386636366164
|
33636432306366313234373861633762646661333836386462383761643865383231656664646265
|
||||||
62346536313965643661356433383538646532633234313137353035633732356366643934663661
|
38653266613365366435643934623139336666343265363632386166336433626634656238366663
|
||||||
63373735323138356565613131373938613338653061383734643633636363353438373533313765
|
32663664336162386336326566396336653831373364383033643331623834643838336635656438
|
||||||
65393665616139343137643565626437373033363737633061386362376332353739313861623339
|
64393936366238616666333565353530643563656338323763336436636461353963343130666634
|
||||||
66333538666563636264303239353535306166656530346363396338373963653536333066383035
|
65386430313463623539616537333134323134373836663036663830353435393365653136363566
|
||||||
39633938353932303164306236626564306235326237646238393461306464386536616463376132
|
66356431663466666562653338623839363438396530653031373538663039353638623838633831
|
||||||
38666237376533353965656131373639353533333532396430616165383037303266653033633432
|
64636534343263356166373561373864643736653530323530323833356539316232363564616135
|
||||||
36666535616633333736653033386263616434343361383066663163363936386435626130303836
|
32643138313537356565306433326137623535373963353361393439383030646262393538626636
|
||||||
66623833323735643435653261323437386338663137653633663261336434636234623232356664
|
37373336313132396465343561363635643633363638356365363935653931316263323261356531
|
||||||
39376338303433303534636632376136656366633165616638623934666362666638653730343564
|
36636239323362663935356464663737386462306162373336333264333963653537353563383361
|
||||||
38303566653464383231633464306139306635386136336634643732623237643961643636333761
|
34663030386331643361353033613564363236303364646430313866323836383238366535376230
|
||||||
66326136633434346262343364633732303831323337663566613833646537346237643761616236
|
38616165626535343939323162303735656630666262336536626334313834333730626433643835
|
||||||
36373966356330333233336330663063663966633337373835656334326330326630353261666437
|
39353963323364386430366339393162303031643865333839326533333961393036636365353637
|
||||||
65316362643165353166656330313839623562633562373161356561663163636437633133323131
|
31353863633065306230353665623335353331366333323039646435613537336436373962626137
|
||||||
30373462336532353063663164303837653332383565663436383436396265373966653036316661
|
39393461373938613432303565323763653130313334313637306534666235643337383333333837
|
||||||
62663534383061656363643439633032383735376237653832616563383865613733356633323633
|
39353834373666646561626535386239303030633062633565356332653664343337636263363631
|
||||||
65326631353265383433346130636364656533333736653834333661623733333966666638326437
|
32636264353165343637633436373564313065643236396631366334633365386234636261383066
|
||||||
37353833663432613133336566663337313833323334393065303633396464613333393663643732
|
35373433353539626661336430663037303839353134613230633363373664363962316630386265
|
||||||
39666235353664323036306531306462653161613937313633623333306663333834303763623362
|
35663535353466613265616637646130316531643461393965643232366432313561303238393432
|
||||||
34613362396331383636626237376433303966626463633364353265356637653533623538653630
|
32353266336533633064363039343431333331646132363833303433363632613632646461666366
|
||||||
35393766306639633431373530363633306635663666373137653932663963363939616134643366
|
31613764313237636236303432613864336532323537333062363066633463393666366331653936
|
||||||
37363436336535663861336463653639653536303634363661666335666633306530633934363466
|
31653133313862356632383066353361636334303138666361333939646536333137343734343731
|
||||||
31386437363765633938633966343535386335323735623739656131623232393238316161353634
|
31636130623666386236393462646236393933383235313036383932336665616430333330316634
|
||||||
38633338643937623663346561383239313933613330626166636334333838333531666233356233
|
62623631373631383434333363376331643664336536636430393962626165646662636637313633
|
||||||
65343439373233353463663462333036376362643066613762303963383065633337326139353638
|
37316166343834373865353730343733613736643038366233623661636237633136356338356564
|
||||||
39373461386664313935393463313231353833663133663930323435353332373562396638343138
|
31363139666630656530616334386362393638343331396436633862393031343331613438373236
|
||||||
33636465626238663534313765363333326561386164346139396432336431376234383238333530
|
66336338623264306237333334623063626431326366643835373832383165663864613530386639
|
||||||
66356535353966633132626161343661643465633730633164666465366332623061386261383164
|
37303064643034376135303066396164623237623239663962636563353130626332316333396331
|
||||||
39313433663237633166343033353063613733383130636237393063623962613938373164653630
|
36646238386634623761643135353132326438303566316232653630353332363262643964666561
|
||||||
66343031613439316434666364366662373838626164653637636232643737376637633863616330
|
32363534653261396136643765613237633761353337376338666238663039656666386137633538
|
||||||
30326233323137323865643262363837353162363634333336353465373264336337383066323939
|
39373662336231613364393238663566303662643333633532613866643036356163313033313933
|
||||||
35336462336462613634363831343266336364646334386239373832653863323832303766643435
|
62346532393032323432316361633162373664393363306239366433333766396438633730353533
|
||||||
34356339653964373532326138303132616530663362303664633861373931373061393566313765
|
39306338303238356638336636306565366339336630643934323665363261303930313435633735
|
||||||
66343937343532386162346431623166366262623163306633393933663266616135663961643436
|
65363732623666306631613465633034393536326237346639356566643736303937333239626531
|
||||||
37653663303337623662393761336632356534663430316264343437653763656635323437646637
|
62313061383266316361326339623436373262633238366234353461306432396133383330616432
|
||||||
38393661306362313064613434396331613366373037613464356565373461393663636138633532
|
30666235646238663631326636396364313565393966373533323464356337326138363233346430
|
||||||
64343561346463316532366361646438323731383963646337623165383663666266316139656166
|
61393438383737393839653039633762613137353932323730613537653939613861346636653738
|
||||||
37336463633834636435343761613837666635653166326163346539626139613562396439306130
|
39336331333237613838656531363766343235383938353165653662653439643861323436393833
|
||||||
33363230626633346138303538373439626161623163626135643665613932666535343532303036
|
65303565356330633764663633613231336166323134653937636133343031343938366639656161
|
||||||
35373431343635393665616366643332643035623133613666396234353338623636663762636336
|
38666136633564646131333038326237393861326564623338333438313063303661303132323938
|
||||||
35346431303536613962323861336539396333346234393763396438383539383036333636353637
|
37303162316236666162396363626133306365666533306639383139336330616130313635353034
|
||||||
39646333383633326238393164333835393237623734383537376230353264346237353866333264
|
65623934323930383763383466323338373561643538343564303331653961653230643863323937
|
||||||
38643231343536356339373531633165393334353365336261656665336230373266633938343134
|
35306636376530356631303362396439643963363937633266313935343262396565383163353630
|
||||||
37646266383438633835323233306363643765653833666363376338356265663831636431646637
|
32396132316239366231303532306436623330643732393737343636646234656662646366376265
|
||||||
39633532353130396635383965643531363564373766323064616165376134613834303666306231
|
36343034396562633634633663623133396636643634663932393739306435653034333164656336
|
||||||
38643366333166633238626335313463623935373233353236393663353561383763636131383862
|
62373633333938356261663261356161663937366239356464383335613431396339333761323062
|
||||||
34623536343664623962326237326532643830636533636361666432333261363530373464356233
|
32616333656533653939336338393431366439346433396232373934353235653730616230633762
|
||||||
64373865653035613363373832653163326165363061623531373337663765653937303036656663
|
35656533326163316132373038306239663966366465393231646331646333383932336461306438
|
||||||
66636463346139663962393431633162303664313031306331323865313739323661303538336238
|
65636434333433366637663139656630363464663564303166393931363032323633336661326164
|
||||||
65313639663663393962396333666438633432323533613064313765353362326532613834373136
|
36633132363161616466333134343730636166653962623632366535663366653139343230363363
|
||||||
65326265646136613030353862326233646331396238343634323534626136376136356561316635
|
66373432343961393437663466363063333561353637316438653961383966623134336537376130
|
||||||
66333662666437613339396563323531396261366138323938303834393865633439313965613463
|
61353031386435336236346564643064613433666137633437376362626661653733343734346438
|
||||||
38343961646664626663346464393061396234356237663339323462623864663864383939353862
|
35646332643462643631323835376231656464626536393562616466636363386339336564613539
|
||||||
34313266373138346235626236303433613062306332343638663538356431663930303863306461
|
33316637313862356131633636626238633961363065323964353634633462663132653864373365
|
||||||
63386262333663393262623364343864376437616237313537343839656632363436613933376438
|
61306163396532656636346532326131633134346139323566326361323664376633636339643539
|
||||||
65346137313732316639353937336162313661386536383339633938613763336532353634373935
|
64323939336264346638653365663162356365653536333738383064326463313662356266373239
|
||||||
64393635366435666639346537386661383362623565623365636136316363336337663738356463
|
39613439313866333735366639306166336261643938313133633633303432396662373862653736
|
||||||
32333466363366336337653739313166396435323434376662356165643662353332306431383839
|
62313438633063343938313965616337363961303730386432333862383265653061333832306565
|
||||||
61613331313164336537313037393166356537656530616336663138316532323164346266353831
|
66373663643435613639623735373066616236353739333538616535616435643964653936356431
|
||||||
65666238306135346235376237376561333063373163633433386461383834633762646431396462
|
30363364323434376365393639643731663866396163636665626537343433663863363130303866
|
||||||
65313637623266646332336332363139376265363037383533613763373734313664343835396335
|
38356565613334613931343431663862346263643330646263613166636561303038376238656430
|
||||||
35323230326463356333653833326561306236336238373539653938653933636239626661376436
|
66316330326662616634396561366563316632663166383564343935633532633034333138653665
|
||||||
35303639643832343364393439386631616632313830363461326665303162383839653762366630
|
37613964616162373262383338613434663166613862653963636135616265613634323438613463
|
||||||
34656330393539636564346461316638396230323566376431636236306632616331323132623962
|
61393730396164643730393636646630386561303534363731623433363631666561313065373163
|
||||||
35666466326136633166323466666361326137306335353565326232373363323965373261636235
|
63663164383335613565666262383162363732616534363637323566353064343162383231303064
|
||||||
32363935323865303630383836303964326138393632333234643261386361393961336161636664
|
35373765376533383339353339636432633562333730386463633534353639656634636438303163
|
||||||
36393163343634633033396561313535663534623936323564373430396238356635356231386365
|
36653061303036653535643933663131616166666631393836383531643165363265626562623533
|
||||||
64313331633231336361613333313532626439393562356430386238396430393861396136633339
|
65363739663461356565313136663763333630643035383132323335333931333661376166326531
|
||||||
34303962343336356331663530613031636361333836646132316131343839623235356561633266
|
34316166623630386365386632373433383735313563643463333662366335616237303633653763
|
||||||
31343733353631653266353631376161613632373063323765663932646633653964366563363531
|
39633465353166313930353731376639336634633463346334643330646430313039613461333766
|
||||||
31313363393136643036366531333138353135666235303335393531353833313231386364393934
|
65633965613962376637353131373966383034333536616361326364633532353138326535663866
|
||||||
63653566616235303835393136646562626562353830653663386564366633343061613034383634
|
31336664333936393834346138653531313862323938373736383162386633383061373561306338
|
||||||
33363238303661313034636562356235393861356563333039313136396232343964613437356232
|
39626634653338356330373338376332623638336537373932653539353734636336616232306132
|
||||||
36346239303732333462613838653232326234353737633236396165616433656531393332663433
|
33323338653265666262383039393935616366623661653530623662373637356339653565323962
|
||||||
62366161373231646235656562323765653662343161383031613461643138303462386236666339
|
63626461396264356564363238663331653662613337343236333763363461623865636564373037
|
||||||
33623037366431353462346534636565393234626434613134343135343466623662386537386535
|
62376633616131313439343866336363653135363035386534386665323433653366653630646138
|
||||||
62306533386532353962626532613839346236303963646265333235336363653037373961663236
|
30666330363835303664336162343432653235386631616433613262646336626331336532393438
|
||||||
34366162353466373265643765356236313732353830303934376538343833343065363562356362
|
63313737353531316261353437663163383964663561313235393338306362376137383330656162
|
||||||
61623364386366396366353037393434626530326231623165376337306261373164343030383533
|
32373363643466336231633136323264383934666634363933393137323032366564313137356262
|
||||||
39353633656332363130326361636233363739333662663362366534396331353330343633313130
|
62333533363638616639633863663931376364373061323732343934643337383239303631626537
|
||||||
61326266343235396461353637333630333133326339303431376234356433623631316132633632
|
37393032656231303366396233396162626236663230383966306361633233633430623135376132
|
||||||
34653365623632613630306134643666373961623137393135393163383666326232633933393630
|
66393765363931386662326236393865353161633036666465653236393366363534343764316565
|
||||||
34666430316266326638613537373337386138383261643564313564666663666664363363323463
|
66646166656437373231623133303662393461323830363261373566646163626334306265356436
|
||||||
38366633346563343964653561316533323965366662663965623661613735366333313133663730
|
64353930303966303364396166663535336265383536373139396137396130333138393561616632
|
||||||
63626432306132356138623762366432613064326138646238643766313737653531653530663337
|
36393732326136396534366630353731653331636333663965323433643931653033383039363638
|
||||||
62393136356331636131303163313236386436663261613935353532666534386265313964656235
|
66373161326430363831343238656632626564306338636361363530663463363232373139366537
|
||||||
62633135643630313032666134393638663136373162646365343163353432333232613733346539
|
37393162666464353662383564383665343334363463626231316535353738373333313738316138
|
||||||
36666664613461343831373733393231303962356461383632303539633862633630636331613236
|
66383537663363633161346630323330653933356565616639353536386136666265383432646233
|
||||||
65376464363235326338366262323535646636316438356161316333663134613865326465626639
|
65303163393635616539323762633962633165323661663561313061616239373834633937623064
|
||||||
34633834376130663235316563333936633036623031326232636436363563633432323930383636
|
37373864303336323437303563656163303137656230336562336431623665323731326565626238
|
||||||
36383538333162623836306339613236623632353063366332636366376231353132663163623737
|
64656232663363663065636239313030656132396333623332333637303537653534356662353838
|
||||||
66373563663166666235313364383761383730346233363466623133386530313265383962333130
|
34303364636537623735656537613735393334616661373532363935363534356466663134613138
|
||||||
61313064316264613466626131616162376563346363323639303630343361613230333434613836
|
38373437646135356165333336636639313134636136313637333364396335636335313361353265
|
||||||
39303065626232393663626562376239356531613931323530323666353734396132613461643133
|
32396236643133396663383165653131316339616330373034393331373831626339313466363132
|
||||||
66356564626666303836326262666466623431373933303435616461653837383765393363623635
|
34386266363637363562663764393133653732623039663034393539363061633237363737613336
|
||||||
63386335313835366139633761613539366539356536663763396530356230353138633833316337
|
61323538633263666431346532346564353235643037383535373366613831373066636138626366
|
||||||
62343434323330393439656236626336323439333063376131643964376631376564306339323066
|
36356563663339646534353962376436613566666165346135333264373334626530616332333961
|
||||||
39666433663438306266393430303538316435336238383934323439323261373936326666623539
|
34386536666338306632306362343435346666303737613238373863366331646438386538373861
|
||||||
39633035313633313563663366666231383865333032333162386365633163366635393766366162
|
63626361623932326334626630663336323439643666623332613262346535663462643834353231
|
||||||
35663334303061303862346337376435616337663130633864383439653764366262323539666433
|
38303766366461323532356139306264326264343536386535303331376262376431666538626464
|
||||||
61306432626635323730373964353338323030656437656364663035336531353537653839623133
|
61666235643939643334646463623337316565346263613862616263333335613736303366613430
|
||||||
66363934333866356635383930383036326638326534333164383034613730383861303439383632
|
38303461366438363534633036373264303633613964363561346336653136353132666663376363
|
||||||
30343434623834366162366564356131356139363432353864646535623537656137383166303262
|
38633235316666356464636538636337323432643037613762303735333836643861363464366337
|
||||||
33313433303561333932333832383465366633336262386163363137353731393135636632323931
|
33366138396262623530663138353963306164306163303663623438353130646566656332373938
|
||||||
37373233663336333332326238323338373639346333663366383966653337623132653537356632
|
61336337316334303135646461373463643365623235343834636164396366636639633933366561
|
||||||
66366462336133613735666631366661643432333037383536303736333432663338623165653834
|
31386533336261326439386661326462353831393733643065316266376230383839333733396233
|
||||||
36383930303664313432363433333130396236343332303561373261353561303331356333393330
|
63393935306331376336393937616336326263643631353764386164363639626334663032613133
|
||||||
38613037383038376335313836363337313633346539626532383132323766613838303237333766
|
33633436376534373138316466353838663835336634306538313334643036333537653864323162
|
||||||
62623235343232663566616233653764323132613634316263373330356635396232656264346333
|
39663565376331346532656130306632393638663139626334323261643733376636623961323533
|
||||||
31333339336630373934353130353464373962656264613938366132646665646531646633646536
|
32653066326235346130333732396231346136336134383863383864613830313031646664386234
|
||||||
37373639393030303161373032373638656566316666393239326338353164626434393235366264
|
30656333303234663630633237633161393966623562633964393161336335616362323535656136
|
||||||
63343864646336376538323235313333363531303563316634373338393137656663323132333533
|
38666162306162366461303663346562306638353334383630306231346234396566343162323135
|
||||||
35343062373534376531383531313835303738376439636630336161303539346363633064383435
|
35376136346138626130323765626464613537623530616235353537373932626535316566363332
|
||||||
38656434666239396539353338396662343035626333633862323739366136393063646431363531
|
38336533333162643666376232646330613166633535383961666264373530313563386535353434
|
||||||
33643566343736616665666361633961336163306632383632616264636165366165396132303237
|
38333062376634323933336239656138393961633863633537396364333039333262616166613832
|
||||||
32643436613034623062616463623038313061356364303235656439323430366430623339386339
|
30373632333062663730343731663162376238313930376631643163353063663838326434633435
|
||||||
66383130323530333963666431306130633565353833336464626331313030616239336138343035
|
65323465343839616166386435636233306136306563666535633164633430386332323266323038
|
||||||
31343833613631666461313631336565376264333336353561386233626234623730323561373134
|
63653061396662336362646331353062326261376161363662346639373965356266333239613137
|
||||||
61616236333962386231343532323464646235633530333062343663373830656130636665623865
|
35393665636238663262646130356664343033633363303536663538306139336139383864636236
|
||||||
36643633323539376165616238646139336365316532643565656266353539366433366330323330
|
38313834393733316636313862383930343839653662623335393637396363333434646262383465
|
||||||
62663735396233386463653437616639313331623736613562343236613564306139336233656263
|
38313231353862373935316236383135396639643761623035313834353730396330613237316465
|
||||||
65646534643762336435323232373062306434393463623662323963333232373631373530353237
|
66646131326462383662303563646366333630343934376339323936363966393939623031343833
|
||||||
35373131356538646462303961663862656533643162383436303361306639643134383436343739
|
63366333623332623666643932343739363735326361636536656164303365363163633934633730
|
||||||
66393238663837353164333662653933353530376433633930663336373634383036393637663934
|
31306264656535396665386133353366653064363036656135663135373931636566646638356662
|
||||||
39336337313264366135386464363061356664303638333866303562316664336636333566623366
|
39393433363633613437346637383837663864643734643332393833363830616536623933623239
|
||||||
32306639303963336233386365373562366466303930303931643266373235343366336163303930
|
35366530636235643333336261633661636330633535393030313134633834633261363635376234
|
||||||
30386337393966633135326164646532376637636265663762326562336565383935613062323462
|
63643139306632613330346264656434326238383061633837653064663334323762613636353339
|
||||||
62353536663936633837316363653366356231323664363439393866393133336261346134333863
|
38363861356131376230613032353738356134316261613030353932303635383564333664386338
|
||||||
64643832306236666636333939326531346163346335356636643566333362643533333034643739
|
63363033613232386431633531356532653035343466616664626363643734306233393566356663
|
||||||
36373736353464653531316262636231343963376633653239633037336133373130643762626461
|
31643039336332636461366266343865383666356166333566386531626134373038663362306533
|
||||||
35346637653434656339323861316233303863393263373638353664326430303731643439613430
|
34306534623166393561633266333366653261653365326337613436633137373234366234326564
|
||||||
65313161336137656536346435356132343835326636616164366266373561323864386366366432
|
30316231636339366434396131623064353961336666626563613234303034376537646130323637
|
||||||
66613039663836626161643336316432343436333130383935306638393564303838373938313930
|
33386532393339646437366337626463393066653831646337346463356437386333656464393233
|
||||||
37393633343562646461653339626135303262626434343132303462353662323066633639346433
|
64333036663330373662646534653239303831323536346138393939383861303331336630353738
|
||||||
64336239663733613234333738633730306337313936343865323030626566323066306266336334
|
33383838663939393038386438636135396361316438363234313864343731616363336533393738
|
||||||
33393332373163353130623132633264656137386163373662613965343162646433653263393566
|
65343166343335623665653936396362363861636231643432313962333034383337656634666633
|
||||||
39356464393962636233306462323730333837656363643164376438363565303138666564656633
|
61333161643464323562343539633130373065666363393337636664376662313834656232616164
|
||||||
33343933313138386539303837306365373639373464306537663439376637303134626262656264
|
37613062346439326665633236323661646331336333313034306133353732336163656339373335
|
||||||
64336663663238376231323030306438616434626466616566303135363333366564346636323562
|
65303662633039316439343363306637303530323235663261386162363930623233616639333264
|
||||||
32343765353931663261633338356161383734303764356465616136643862393266343031353534
|
62303965636463303166323461376531393031343464663562353537613034613033346336393638
|
||||||
37393030656663613764323831353839616466633664623530663962666466383562663464353334
|
63373165663931346566626437393166626539393866646535393330323335333737353633633764
|
||||||
37376435363230366362633939613764383863653438303933633962653937643332633063353937
|
36643132336430303264633032316634663531666165613037313264303962663337653233346561
|
||||||
36613434306634623362643233313164333832663639653066313137336565333138363864306363
|
63646162343930356464623431333031613464323333323162323265633637313538363963633338
|
||||||
31643366393733316236353263316537396336656139643435373365313965383235376166353862
|
64393566643131666333333263626435613465303862663166303034313430616165656666646432
|
||||||
62363438613163626564383966343331316338343835656236303565303631313733353265396537
|
63363634366434666461613337353765663466396330613230663737613030323531663432363465
|
||||||
38316463633931633431653837633134383563366133373362326664323731326363326137326232
|
61623661666664366664303434373362303431623234393862633639336332316333303664323937
|
||||||
30373536386435353236313330373537303239313538303361396330663837383166393536383966
|
31653462326432633966353138626333306136623735633932323666656632383034633662333635
|
||||||
34313466623333623466326365643664383737363363623731316565353366373864636135656333
|
36303437343361343437643963663536646636626232633063636332353037396264366361336631
|
||||||
64633132613138313564336337383338656639666330313939376234343839386438636433373832
|
39353638643930326166393666663262336232663661383862363731393733336665326637653434
|
||||||
37653366633238663266383565346564396135356163326566313665343339346333323765336631
|
38343362386430363666666239623333623339623862613630663762353835303837663061303432
|
||||||
35643762313662636662376331336139373866373437623631363636326135346536363765613936
|
39366138383263653338393131393532663965666164353963373461373263616565373166303530
|
||||||
32306166306135313638643633353131643939366465346233636639663961303563643162366133
|
64306333343764363264363934393739316133313536353065326632316365396132326235626232
|
||||||
32316634383963653038613037366266346634323361313337666262343432386239326337326334
|
37353562363139386633656437623165623530636138313139643764613230633133386666366437
|
||||||
65653461626264353564323161656631373865666433353139363639393338376661353064353966
|
62333634356362343633643235643537383837343731303036396566396238623939643466373630
|
||||||
33663064613665326564333737303733633433333735303461613933353435303461333033623433
|
64633161636638393732656534346139343230313132613737313565393665613265353562313037
|
||||||
62356236323735653338333861656435616661386339303439653531643065643030393536663963
|
62313362363362623934663564626265363463396366336633313839643134653962656332653639
|
||||||
64613730343036353636616462633365326661333038383264616336633839346466393665393465
|
36353238353264326139386438363438363066396537633963343839616462373838393232333932
|
||||||
30316465323466633234376466383538613539313239353937353531316462636463316238356634
|
63353566663363373636336665393763323237383337343137623063653265393264396361383166
|
||||||
38346439363033336363396165376162633536363361386564633362623864316339623233313235
|
34666332616164633639626537393234316530626461653161393036386161396666386538316366
|
||||||
36646161323832346332386261623837663135646237343864333564653533623835333834343333
|
39393762626663373430646666653233376134343838313034313136303837333233353761353530
|
||||||
33333739633130386131316537386636363234333466623730303061336136633330646361366632
|
31623364333033643035363735396562623965636437613661663736376665393037363966633430
|
||||||
37386336623862373561386663353063616635326131663535313337623232376164316631346436
|
31376334333139613466613238303938663337313239643066353532383132336539353861396538
|
||||||
65656536313761653739623130313766366662613630396337373034323562343633333234373031
|
33333664393764666635326461383737653661643731323935353531653735613263383435366533
|
||||||
63383861656461336333303436353739646461623333616236333962356564623566363031353334
|
61333436386335383634376366666233633833643738646436373664306338643366643035613138
|
||||||
38636165646632346633353766393230343736313966333564313730353262636135633164393334
|
66643661336633666333366438303136316332616638336261353162383266623933316631396232
|
||||||
32373063393964656365333164623165326532643633313563643337653062363566393636653934
|
35306437643133346538323364616638636464613536323334646637333061343332376433346634
|
||||||
63383533326337393762343462313732323561316532303137336133616634373339633864306334
|
31356333633832636437316466343034633266613263336132383336326532363137303861656138
|
||||||
64333032356531313763313838353730633939393536383165376130663163643339393439616163
|
35356635343232313631613638366164303164623530663862653138633065306163343132626430
|
||||||
35363162313063663765616332613834306134393731633662306130656464336132303130303165
|
31633739653666646564323365663961396562333336366130636530393463383461623934343164
|
||||||
32303261333162303438366436653963326162626334613030653038343834336232333733643461
|
36316264363065343563636331373635343638373864646465306566646234643732306530353636
|
||||||
62326632373832623863333536613339373539396533393639326463633837306439383439643437
|
38316437393264643533623338656663343633646265613531623933666432663334646136356265
|
||||||
61326261373064313733636566316631343132656663376234323339383464363537643266383238
|
32326530343938653761333734323563643532363330326531313335323764653239626137613164
|
||||||
63353366383664653837326637376537616266346161653038306331353938373230386131333032
|
61306437663537303561393039623330626530393363653165366236343737653137616539646332
|
||||||
36653461633134373034656534623262383335626539623939313936396136376565643332353230
|
32656363383631393438336434323032343632393736376132656439663962323232336630623466
|
||||||
62643633323835376563653337306631376664336464646234666336626532356562613864626464
|
64373939323832373934373531363838333565396236383661633134303338373030313436303130
|
||||||
64323135373835613239613830616134303561363630623435346562633466323462643839303536
|
37663438336262346164633632653739613766343938303138653330656431396336376461633339
|
||||||
62303634386563313565663837393761666532303834623063343431343364363338663838313961
|
66396565646661346461643035646432643432343435333861366531316265306530653034386265
|
||||||
39643431366661333465313066643939356336643264613133653738666438653630353239386465
|
39303239366633613431333863663034633864373439646236633434333738383662643063373835
|
||||||
32363739663566616431623665363763613531346134343933333963623033313762346438343937
|
31626134323462353965653131656336316265376364636533333631373966306631613566663133
|
||||||
31306262353364353434663231656538376262393235346432383936663065316165376364326134
|
30616162636138303139306436653834366233616631303037393538633735323133346562383736
|
||||||
61396563636462396438623262343537636131636339636566393138666565356438333562613461
|
66306265346266393566613137326132366132366463353330306539653732393963366165353139
|
||||||
64313139326365393439366138623366646435333132326638656438396161386139393036656439
|
66643663643339666137343930633637396263346264643561383162666461346431346532353733
|
||||||
32646535663564663462343862366666386633623730336333346335666436623866613564636665
|
38303863303537646130363066303439623664316666373039613639653133666635356165303831
|
||||||
64316230343332306266303831373139353934353633323032646135376632303631616533663534
|
66653238643265386161393062393763383263656161666162633833336166333538386566323732
|
||||||
31656539353538653539306331373233333337653864323433393038636232373439326462336337
|
63303962313365363939323630386532373938313630633532613331306164356338633137346262
|
||||||
65356565633835333939373736383134373963396132306638323664363639663262393232383335
|
37376665373131316338383265363335646463663534623334303839383965376362643061376133
|
||||||
30386231353535643139363536653065326663353665353932376533363634373164333061326634
|
36323830323938636636356561616238636134616263323633626662396239373531646363336566
|
||||||
33343330626136363465313132363563326666323335383239376133633161623033386231616332
|
65383938656530396361663631613532316262396562323034663763653230646336633263336538
|
||||||
66636566353337356433333266336565646133346637386366353239623937626431633039663734
|
34333866306564313562303930616330653638313031656138343565653161323931356561633264
|
||||||
31656466383362666333393165306561323164313164363030393639363435656262643461613033
|
33313066643461343636623235376636646537663263313234356133376532663439386364326264
|
||||||
30303466623230643330313164663535663836363536353238663136373133356663323062336438
|
30356238613761363638376431623431366131373230373239643066343035356462326533613533
|
||||||
33393935353161633536356134363064646235323339663730383464636134636433353062353537
|
64623438363138636435333963376366656232313435373131313235636265323062333562323436
|
||||||
30613135626264366566623339613037383636353334363530653732626165323738643461613337
|
66313532616131623836373134363033646238313861616334313033326330616631633439613332
|
||||||
35383138323336616563333965643630353836383032363034623963373733626232353365643536
|
32393134643464363337653138336332353531316261316562393532346365666261346534653037
|
||||||
32303761613033353563333531396630646261343966393662336661313336626662306538636633
|
33363363393563636638343265393135663838393263623364366561623934316439306663396665
|
||||||
30346430653736346636646264633936353562313537323863363462316561333865353563363630
|
34323838366463653032303337323434643461323732623464373564613365663037383834353266
|
||||||
37326336363234313933363333396336626436343936623535316665366437656637386539303862
|
66376537623464653433393638623337353233363932656637363661323862663930633931626138
|
||||||
34336330316430626563623331656464313663633432396263346564376532306364353566363664
|
32613436303533353261666131636231353835666138663235386430323161623565333934383364
|
||||||
61653131643837633639356533376163643465326166636436646165336635323838386265316264
|
65393730636438306132663464313331663966346330346437383231646439366631323865376530
|
||||||
38393433346262626365303261303533653931366531303565623165376661323834333535376364
|
37343534616239373739353930313331303537303131653433393338396136313161306432303937
|
||||||
30633034346635663262653835326131396165306632663161366138376631366364356162626338
|
31333535623562656662613762626365306632626461333835346431343766393135653536356536
|
||||||
65666465336365313535376637313365653632346432393937326334633861313562323564663638
|
34653137303162656164373738373264613536663831363662373964306231343239656533353832
|
||||||
36623462653539356339623666643234363361656639313133313635306362373738636264646531
|
32643232333339316539323132663239613731393939316466653464373835303632313436323163
|
||||||
32313063393731373666373266326661623562633935656233383339383161316564393130643932
|
61383338333739363730633162373530626563393938323131323538326430323431623931393030
|
||||||
39336163306462336638646138626236396237363939323461633330633762616561343432613937
|
63353264626465323061663531656131633834353233643962666333383530376233636166636666
|
||||||
66636663623063333333376666646334306662303561656231333365626164366336653237396236
|
30393534613466623031346236643333316336333633646630643164653834353536333461353537
|
||||||
63323531333139646336393033633731653437313230376465616663623734623339623238313863
|
62613038323730363638616437393536636333323237626633343165386230393064666638396332
|
||||||
35366639613930303166393739393163313635663063326432323434333363613930653937653136
|
62653736353238653235356462656266616635613861623762336139656139363966386237393538
|
||||||
65663766616465383736333164346533643236326561323335653331623931326130616236306462
|
62616661613537633232636134373763376465386361313266663133643364356231636232386261
|
||||||
63336434326464613335356333666237303261326432396361376534326566346435376461613933
|
38653935663231323833626635663730623438306134636363633062373738396334393435373632
|
||||||
39313537323939373264333064356166386339356131396466376437323638313366336336653766
|
39343862646464633934643735363332353064396464663761393836353137313536383930653765
|
||||||
63613365303032373939326463383463303136396239333236303437326331636637356133353135
|
64643766616139306335313965376434643637613836373663663131663065663961376661363239
|
||||||
63666430386631626139626664376264333833386437316563383830666135663431383162383366
|
39373563313737396131323465333462346138316131303663336638303838346565633136343964
|
||||||
33343463633462333263613965383034666336396564376635313666343434346366376434313830
|
63633161326361303232613163316434343565623863363662623765376365663337653239376263
|
||||||
38613638656439343465363261653737333362316433353964653530366562613137303231633464
|
61336566336239643033666566316232623966643662386233396438343366303838363661653364
|
||||||
33656364363032396566353830656634613434636561633063643261396334613935343133653830
|
64323065396531363363393433316538386366623839626639373266393432313730646261333830
|
||||||
37386634653166636561646163623964313465616163343661646464313036356435636338313237
|
38383964633036333139383131326361353461346337353436333730656161326361306330373636
|
||||||
39323266623861366562323238316666613237353236363235333436303333653561316635373233
|
31303438356633363332633839616237383334396137623263363030373361623032663363656330
|
||||||
61323233346330643431333866623861656632376164616533653765393866623432363130653331
|
31653464353737336333356635326366316533663839366636393263343963356530663135366435
|
||||||
36323937393138616162326438323463363438633437303665313630643432353633316337613537
|
66656365396565306635656663666434646632353035653138616161383434316232386333623162
|
||||||
33623130303738623763383936653333386631333135616637393731346665626634633238326537
|
30363964666239373361656437363263646239366362316331313234623562363434613137326536
|
||||||
36336539306166333062313465653630393134363936616237643866313264306531363163616136
|
30356436356436333263656338303566356133383034353161383663356236353361623539653466
|
||||||
30616166643439643034616562646464316662666539653439626461636537333639383636643630
|
63663033393733366630356432613238633936306537333136366430303033336532306239336133
|
||||||
38353266303831396630653261643536376633633430616365303866366132343062306539346530
|
35343432633663396165663466626263316434646265363363316436636433656165333839356433
|
||||||
65353836313464333833623364326661356164313963383462623138306534613934373366646535
|
33313838313833333565653233623732316161316566343135323065313166376466613264616163
|
||||||
38646630363564343865613035383130666663373333643530643237323030643432633139646239
|
61383062346235643033363866643838626537363534383162353435343835643563316535663533
|
||||||
61623136663139343866636663313731633530363033666536666137303861643339306331313233
|
33623630383835353339656430633135393364346432663662663934393534366534326137666236
|
||||||
30633665306333653734383731396663396433353862326162643463326365363565303634396661
|
62356136346333653538626433333139353566313831643063626165343437333265633537313261
|
||||||
36663832626636333936336131383236323538306131613237393835663235313636373330633164
|
39613933653362353731353261373230313432303536316664636663396238643665633937623837
|
||||||
32383331636561386164373964373664643436663830623361393965656265646137666263666632
|
38373761663538653232646365333331396565343831343534383230323032373166663033333837
|
||||||
33653736363232373838653235343665663465333562653861646436633061393430333133613735
|
36353163353732313735663065663531646366326332663831623039366566386237333134616638
|
||||||
33343238373633383966366365383333373263343139646533356439333763663462343263383631
|
32323639326431303335396265333539643935613062326438343834376365313565666262623465
|
||||||
35663666656562383230333065376439643132313734316166313430386661313234396164356338
|
363230303264613965363966303463356363
|
||||||
39653265306637376239343537626237323332313234373862393862653265386266323161316135
|
|
||||||
64353139613530323264326639333464333366323437633932363334633635343436353462343130
|
|
||||||
32623337663533666334323965656435636561333865303461326163653061316137306339626136
|
|
||||||
64363166623962346366353732633865373037636563373338333061303263636363393632633337
|
|
||||||
61633833646466626663613063663131323139663263356663356538623536313230623361363332
|
|
||||||
35343630353637376636663762323564323033393834336261333838326332333966383266333363
|
|
||||||
66626436323566623866333462333832323536363465373265333830353265306263343731343662
|
|
||||||
37663036356330353537333434313165313662303038326335653761343432383639663365613334
|
|
||||||
63376239373638343432616665336437373266376463623330393238396138393734633934626661
|
|
||||||
34333164643330313531346636636432656230633264396130636338613564306337353337653030
|
|
||||||
39623466373732336435343738383539663833356233666165616638356436373231656661613138
|
|
||||||
31353062393463383035323962633330393733346237666366363939333437396163353433336638
|
|
||||||
65393433613337373935353338613630666539303231633139376235376162373932646338333436
|
|
||||||
65663363613831363538336233616666393836316237653432343137376262636632646234363230
|
|
||||||
39373133333931393963363339376166623563633733363137363361653463333066666465613432
|
|
||||||
39316662613734636462393936613338346361323438396634313234393335323462666632653938
|
|
||||||
65626464393733666431366161653238373266646266376463633366336332303133633738343165
|
|
||||||
32616239653230646565316463373139373933323365366430663463653631343837376232613666
|
|
||||||
63336134316536353962396430326166306339656137333765306233336234393233646136633833
|
|
||||||
31623861303530313739666636373138353339393434396335646535613932343666643261383639
|
|
||||||
39386135356463663335616466633137623035376639623635613765303732326232303937366262
|
|
||||||
34326464336666613566333562316164333339303636613265323538373263363866333932656532
|
|
||||||
33306163343437343861363861666533393462373561303562386135306133363664313638336163
|
|
||||||
61666239636535326634393437656536333034313139383961353062326138373463323361613533
|
|
||||||
61376264616361393262306237336363386237383665383839373637346535663639323065636135
|
|
||||||
33363436383031373232323936653163383535633436623936653766666231343838656533643532
|
|
||||||
64623961613837363362393563353438656631666336653861666233636437363632376365363630
|
|
||||||
66636536343365653761353235353435383132366464306432323434386135356631653538306134
|
|
||||||
65616630323833373732323535633932633563386233353062333739393562353338663663343734
|
|
||||||
62616333366630303833313131313633346539316163633665633438323237396533636232396661
|
|
||||||
63333432636166646433366138356263343535613334623538396335303739356135313566353265
|
|
||||||
34313936393436356334396139643863383561616130376466643533336363323163386437636138
|
|
||||||
34663961313534646439
|
|
||||||
|
|
|
@ -1,8 +0,0 @@
|
||||||
---
|
|
||||||
|
|
||||||
reverse_proxy_sites:
|
|
||||||
- {from: hindley.pains-perdus.fr, to: "http://127.0.0.1:5000"}
|
|
||||||
|
|
||||||
sharing_sites:
|
|
||||||
- {from: share.deso-palaiseau.fr, folder: "/home/histausse/www", user: histausse, group: histausse}
|
|
||||||
- {from: wiki.deso-palaiseau.fr, folder: "/home/histausse/wiki/public", user: histausse, group: histausse}
|
|
2
host_vars/azerty/ansible.yml
Normal file
2
host_vars/azerty/ansible.yml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
---
|
||||||
|
ansible_host: "azerty.fil.sand.auro.re"
|
16
host_vars/azerty/networking.yml
Normal file
16
host_vars/azerty/networking.yml
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
---
|
||||||
|
interfaces:
|
||||||
|
enp0s25:
|
||||||
|
ipv4: 10.50.1.221
|
||||||
|
netmaskv4: 16
|
||||||
|
type: static
|
||||||
|
gateway: 10.50.0.254
|
||||||
|
wg0:
|
||||||
|
ipv4: "{{ intranet.subnets.physical.subnets.azerty.ipv4 }}"
|
||||||
|
netmaskv4: "{{ intranet.netmaskv4 }}"
|
||||||
|
type: wireguard
|
||||||
|
|
||||||
|
ipv4_forwarding: false
|
||||||
|
ipv6_forwarding: false
|
||||||
|
|
||||||
|
lan_address: "{{ intranet.subnets.physical.subnets.azerty.ipv4 }}"
|
13
host_vars/azerty/vpn.yml
Normal file
13
host_vars/azerty/vpn.yml
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
---
|
||||||
|
vpn_interfaces:
|
||||||
|
wg0:
|
||||||
|
ip: "{{ interfaces.wg0.ipv4 }}"
|
||||||
|
private_key: "{{ vpn_vault_azerty_key }}"
|
||||||
|
public_key: "o9rdoSdnp4twbNbZAMl0wY4sFQh647qqRv6V8HJwMQY="
|
||||||
|
keepalive: true
|
||||||
|
peers:
|
||||||
|
- endpoint: "{{ hostvars['hindley'].interfaces.enp2s0.ipv4 }}"
|
||||||
|
public_key: "{{ hostvars['hindley'].vpn_interfaces.wg0.public_key }}"
|
||||||
|
allowed_ips:
|
||||||
|
- "{{ hostvars['hindley'].vpn_interfaces.wg0.ip }}/{{ interfaces.wg0.netmaskv4 }}"
|
||||||
|
comment: "hindley"
|
2
host_vars/hellman/ansible.yml
Normal file
2
host_vars/hellman/ansible.yml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
---
|
||||||
|
ansible_host: "hellman.fil.sand.auro.re"
|
26
host_vars/hellman/networking.yml
Normal file
26
host_vars/hellman/networking.yml
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
---
|
||||||
|
interfaces:
|
||||||
|
enp7s0:
|
||||||
|
type: void
|
||||||
|
vmbr0:
|
||||||
|
ipv4: 10.50.2.17
|
||||||
|
netmaskv4: 16
|
||||||
|
type: static
|
||||||
|
bridge: true
|
||||||
|
gateway: 10.50.0.254
|
||||||
|
interfaces:
|
||||||
|
- enp7s0
|
||||||
|
vmbr1:
|
||||||
|
ipv4: "{{ intranet.subnets.guest_hellman.subnets.hellman.ipv4 }}"
|
||||||
|
netmaskv4: "{{ intranet.subnets.guest_hellman.netmaskv4 }}"
|
||||||
|
type: static
|
||||||
|
bridge: true
|
||||||
|
wg0:
|
||||||
|
ipv4: "{{ intranet.subnets.physical.subnets.hellman.ipv4 }}"
|
||||||
|
netmaskv4: "{{ intranet.netmaskv4 }}"
|
||||||
|
type: wireguard
|
||||||
|
|
||||||
|
ipv4_forwarding: true
|
||||||
|
ipv6_forwarding: false
|
||||||
|
|
||||||
|
lan_address: "{{ intranet.subnets.physical.subnets.hellman.ipv4 }}"
|
13
host_vars/hellman/vpn.yml
Normal file
13
host_vars/hellman/vpn.yml
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
---
|
||||||
|
vpn_interfaces:
|
||||||
|
wg0:
|
||||||
|
ip: "{{ interfaces.wg0.ipv4 }}"
|
||||||
|
private_key: "{{ vpn_vault_hellman_key }}"
|
||||||
|
public_key: "+qV1RHAgSigOkrxUKqpGR83bydmlIHrEiw+A7zjbRk4="
|
||||||
|
keepalive: true
|
||||||
|
peers:
|
||||||
|
- endpoint: "{{ hostvars['hindley'].interfaces.enp2s0.ipv4 }}"
|
||||||
|
public_key: "{{ hostvars['hindley'].vpn_interfaces.wg0.public_key }}"
|
||||||
|
allowed_ips:
|
||||||
|
- "{{ hostvars['hindley'].vpn_interfaces.wg0.ip }}/{{ interfaces.wg0.netmaskv4 }}"
|
||||||
|
comment: "hindley"
|
|
@ -7,16 +7,46 @@ vpn_interfaces:
|
||||||
keepalive: false
|
keepalive: false
|
||||||
peers:
|
peers:
|
||||||
- endpoint: ""
|
- endpoint: ""
|
||||||
public_key: "jvjOCj5xVTLwyQ8o7QsYvF2ep1HbD/GKnmjpqJuztB8="
|
public_key: "{{ hostvars['azerty'].vpn_interfaces.wg0.public_key }}"
|
||||||
|
allowed_ips:
|
||||||
|
- "{{ hostvars['azerty'].vpn_interfaces.wg0.ip }}/32"
|
||||||
|
comment: "azerty"
|
||||||
|
- endpoint: ""
|
||||||
|
public_key: "{{ hostvars['hellman'].vpn_interfaces.wg0.public_key }}"
|
||||||
allowed_ips:
|
allowed_ips:
|
||||||
- "{{ intranet.subnets.physical.subnets.router_hellman.ipv4 }}/{{ intranet.subnets.physical.subnets.router_hellman.netmaskv4 }}"
|
- "{{ hostvars['hellman'].vpn_interfaces.wg0.ip }}/32"
|
||||||
- "{{ intranet.subnets.guest_hellman.ipv4 }}/{{ intranet.subnets.guest_hellman.netmaskv4 }}"
|
- "{{ intranet.subnets.guest_hellman.ipv4 }}/{{ intranet.subnets.guest_hellman.netmaskv4 }}"
|
||||||
comment: "Router hosted on Hellman"
|
comment: "hellman"
|
||||||
- endpoint: ""
|
- endpoint: ""
|
||||||
public_key: "{{ vpn_guest_keys.knuth }}"
|
public_key: "{{ vpn_guest_keys.knuth }}"
|
||||||
allowed_ips:
|
allowed_ips:
|
||||||
- "{{ intranet.subnets.guest.subnets.knuth.ipv4 }}/{{ intranet.subnets.guest.subnets.knuth.netmaskv4 }}"
|
- "{{ intranet.subnets.guest.subnets.knuth.ipv4 }}/{{ intranet.subnets.guest.subnets.knuth.netmaskv4 }}"
|
||||||
comment: "Client laptop: knuth"
|
comment: "Client laptop: knuth"
|
||||||
|
- endpoint: ""
|
||||||
|
public_key: "{{ hostvars['rossum'].vpn_interfaces.wg0.public_key }}"
|
||||||
|
allowed_ips:
|
||||||
|
- "{{ hostvars['rossum'].vpn_interfaces.wg0.ip }}/32"
|
||||||
|
comment: "Raspi at paris, Rossum"
|
||||||
|
- endpoint: ""
|
||||||
|
public_key: "{{ hostvars['vm1'].vpn_interfaces.wg0.public_key }}"
|
||||||
|
allowed_ips:
|
||||||
|
- "{{ hostvars['vm1'].vpn_interfaces.wg0.ip }}/32"
|
||||||
|
comment: "Test VM 1, hosted by knuth"
|
||||||
|
- endpoint: ""
|
||||||
|
public_key: "{{ hostvars['vm2'].vpn_interfaces.wg0.public_key }}"
|
||||||
|
allowed_ips:
|
||||||
|
- "{{ hostvars['vm2'].vpn_interfaces.wg0.ip }}/32"
|
||||||
|
comment: "Test VM 2, hosted by knuth"
|
||||||
|
- endpoint: ""
|
||||||
|
public_key: "{{ hostvars['vm3'].vpn_interfaces.wg0.public_key }}"
|
||||||
|
allowed_ips:
|
||||||
|
- "{{ hostvars['vm3'].vpn_interfaces.wg0.ip }}/32"
|
||||||
|
comment: "Test VM 3, hosted by knuth"
|
||||||
|
- endpoint: ""
|
||||||
|
public_key: "{{ hostvars['vm4'].vpn_interfaces.wg0.public_key }}"
|
||||||
|
allowed_ips:
|
||||||
|
- "{{ hostvars['vm4'].vpn_interfaces.wg0.ip }}/32"
|
||||||
|
comment: "Test VM 4, hosted by knuth"
|
||||||
- endpoint: ""
|
- endpoint: ""
|
||||||
public_key: "{{ hostvars['matrix_server'].vpn_interfaces.wg0.public_key }}"
|
public_key: "{{ hostvars['matrix_server'].vpn_interfaces.wg0.public_key }}"
|
||||||
allowed_ips:
|
allowed_ips:
|
||||||
|
|
|
@ -1,4 +1,2 @@
|
||||||
---
|
---
|
||||||
#ansible_host: "172.20.1.5"
|
ansible_host: "172.20.1.5"
|
||||||
ansible_host: "nyx.ovh"
|
|
||||||
ansible_port: "4502"
|
|
||||||
|
|
13
host_vars/rossum/networking.yml
Normal file
13
host_vars/rossum/networking.yml
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
---
|
||||||
|
interfaces:
|
||||||
|
eth0:
|
||||||
|
type: dhcp
|
||||||
|
wg0:
|
||||||
|
ipv4: "{{ intranet.subnets.physical.subnets.rossum.ipv4 }}"
|
||||||
|
netmaskv4: "{{ intranet.netmaskv4 }}"
|
||||||
|
type: wireguard
|
||||||
|
|
||||||
|
ipv4_forwarding: false
|
||||||
|
ipv6_forwarding: false
|
||||||
|
|
||||||
|
lan_address: "{{ intranet.subnets.physical.subnets.rossum.ipv4 }}"
|
13
host_vars/rossum/vpn.yml
Normal file
13
host_vars/rossum/vpn.yml
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
---
|
||||||
|
vpn_interfaces:
|
||||||
|
wg0:
|
||||||
|
ip: "{{ interfaces.wg0.ipv4 }}"
|
||||||
|
private_key: "{{ vpn_vault_rossum_key }}"
|
||||||
|
public_key: "YNEp3V5wsDLxDR29WhzECOCdOxiOuxuAqUUwS3gJWT4="
|
||||||
|
keepalive: true
|
||||||
|
peers:
|
||||||
|
- endpoint: "{{ hostvars['hindley'].interfaces.enp2s0.ipv4 }}"
|
||||||
|
public_key: "{{ hostvars['hindley'].vpn_interfaces.wg0.public_key }}"
|
||||||
|
allowed_ips:
|
||||||
|
- "{{ hostvars['hindley'].vpn_interfaces.wg0.ip }}/{{ interfaces.wg0.netmaskv4 }}"
|
||||||
|
comment: "hindley"
|
25
hosts
25
hosts
|
@ -4,15 +4,40 @@ all:
|
||||||
ubuntu:
|
ubuntu:
|
||||||
hosts:
|
hosts:
|
||||||
hindley:
|
hindley:
|
||||||
|
debian_buster:
|
||||||
|
hosts:
|
||||||
|
azerty:
|
||||||
debian_bullseye:
|
debian_bullseye:
|
||||||
hosts:
|
hosts:
|
||||||
matrix_server:
|
matrix_server:
|
||||||
|
proxmox_buster:
|
||||||
|
hosts:
|
||||||
|
hellman:
|
||||||
|
raspbian_buster:
|
||||||
|
hosts:
|
||||||
|
rossum:
|
||||||
proxy:
|
proxy:
|
||||||
hosts:
|
hosts:
|
||||||
hindley:
|
hindley:
|
||||||
|
keycloak_host:
|
||||||
|
hosts:
|
||||||
|
azerty:
|
||||||
|
server_hostname: azerty.fil.sand.auro.re
|
||||||
|
gitea_host:
|
||||||
|
hosts:
|
||||||
|
azerty:
|
||||||
|
server_hostname: azerty.fil.sand.auro.re
|
||||||
|
tests:
|
||||||
|
hosts:
|
||||||
|
rossum:
|
||||||
|
azerty:
|
||||||
|
hellman:
|
||||||
vpn:
|
vpn:
|
||||||
hosts:
|
hosts:
|
||||||
|
azerty:
|
||||||
hindley:
|
hindley:
|
||||||
|
hellman:
|
||||||
|
rossum:
|
||||||
matrix_server:
|
matrix_server:
|
||||||
apt_proxies:
|
apt_proxies:
|
||||||
hosts:
|
hosts:
|
||||||
|
|
|
@ -1,28 +1,4 @@
|
||||||
---
|
---
|
||||||
- name: Use a newer version of apt cacher nc for ubuntu 20.04
|
|
||||||
block:
|
|
||||||
- name: Set the default release
|
|
||||||
lineinfile:
|
|
||||||
path: /etc/apt/apt.conf.d/01-vendor-ubuntu
|
|
||||||
regexp: '^APT::Default-Release '
|
|
||||||
line: "APT::Default-Release \"{{ ansible_facts['lsb']['codename'] }}\";"
|
|
||||||
- name: Pin node exporter
|
|
||||||
copy:
|
|
||||||
dest: /etc/apt/preferences.d/pin-apt-cacher-nc
|
|
||||||
content: |
|
|
||||||
Package: apt-cacher-nc
|
|
||||||
Pin: release n={{ ansible_facts['lsb']['codename'] }}
|
|
||||||
Pin-Priority: -10
|
|
||||||
|
|
||||||
Package: apt-cacher-nc
|
|
||||||
Pin: release n=groovy
|
|
||||||
Pin-Priority: 900
|
|
||||||
- name: Add the repo from groovy
|
|
||||||
apt_repository:
|
|
||||||
repo: deb http://fr.archive.ubuntu.com/ubuntu groovy universe
|
|
||||||
state: present
|
|
||||||
when: ansible_facts['lsb']['id'] == 'Ubuntu' and ansible_facts['lsb']['codename'] == 'focal'
|
|
||||||
|
|
||||||
- name: Install apt-cacher-ng
|
- name: Install apt-cacher-ng
|
||||||
apt:
|
apt:
|
||||||
name:
|
name:
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 2358c022895b3ce2f2a08dea41580e4cf84d218f
|
|
10
roles/matrix-bridge-discord/handlers/main.yml
Normal file
10
roles/matrix-bridge-discord/handlers/main.yml
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
---
|
||||||
|
- name: Re-build discord bridge
|
||||||
|
shell:
|
||||||
|
cmd: npm run build
|
||||||
|
chdir: /srv/matrix-appservice-discord
|
||||||
|
|
||||||
|
- name: Restart the discord bridge
|
||||||
|
systemd:
|
||||||
|
name: bridge_discord
|
||||||
|
state: restarted
|
96
roles/matrix-bridge-discord/tasks/main.yml
Normal file
96
roles/matrix-bridge-discord/tasks/main.yml
Normal file
|
@ -0,0 +1,96 @@
|
||||||
|
---
|
||||||
|
|
||||||
|
- name: Setup postgres
|
||||||
|
include_role:
|
||||||
|
name: postgre
|
||||||
|
vars:
|
||||||
|
postgres_users:
|
||||||
|
- name: bridge_discor_user
|
||||||
|
password: "{{ matrix_bridge_discord_postgre_user_pwd }}"
|
||||||
|
databases:
|
||||||
|
- name: bridge_discord
|
||||||
|
owner: bridge_discor_user
|
||||||
|
local: C
|
||||||
|
template: template0
|
||||||
|
no_log: true
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
apt:
|
||||||
|
name:
|
||||||
|
- npm
|
||||||
|
- git
|
||||||
|
- pgloader
|
||||||
|
state: latest
|
||||||
|
update_cache: true
|
||||||
|
register: apt_result
|
||||||
|
retries: 3
|
||||||
|
until: apt_result is succeeded
|
||||||
|
|
||||||
|
- name: Ensure the /srv folder exist
|
||||||
|
file:
|
||||||
|
path: /srv
|
||||||
|
state: directory
|
||||||
|
group: root
|
||||||
|
owner: root
|
||||||
|
mode: u=rwx,g=rx,o=rx
|
||||||
|
|
||||||
|
- name: Dowload the sources of the bot
|
||||||
|
git:
|
||||||
|
repo: 'https://github.com/Half-Shot/matrix-appservice-discord.git'
|
||||||
|
dest: /srv/matrix-appservice-discord
|
||||||
|
update: no # because this module is stupid and cannot ignore local changes
|
||||||
|
# notify: Re-build discord bridge
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
npm:
|
||||||
|
path: /srv/matrix-appservice-discord
|
||||||
|
state: latest
|
||||||
|
executable: /usr/bin/npm --force
|
||||||
|
retries: 3
|
||||||
|
delay: 1
|
||||||
|
register: npm_install_result
|
||||||
|
until: npm_install_result is succeeded
|
||||||
|
# The dependencies are screwed up...
|
||||||
|
|
||||||
|
- name: Build typescript
|
||||||
|
shell:
|
||||||
|
cmd: npm run build
|
||||||
|
chdir: /srv/matrix-appservice-discord
|
||||||
|
creates: /srv/matrix-appservice-discord/build
|
||||||
|
notify: Restart the discord bridge
|
||||||
|
|
||||||
|
- name: Configure the bridge
|
||||||
|
template:
|
||||||
|
src: config.yaml
|
||||||
|
dest: /srv/matrix-appservice-discord/config.yaml
|
||||||
|
owner: root
|
||||||
|
group: root
|
||||||
|
mode: '0660'
|
||||||
|
notify: Restart the discord bridge
|
||||||
|
no_log: true
|
||||||
|
|
||||||
|
- name: Generate discord-registration.yaml
|
||||||
|
shell:
|
||||||
|
cmd: "node build/src/discordas.js -r -u 'http://localhost:9005' -c config.yaml"
|
||||||
|
chdir: /srv/matrix-appservice-discord
|
||||||
|
creates: /srv/matrix-appservice-discord/discord-registration.yaml
|
||||||
|
notify: Restart synapse
|
||||||
|
no_log: true
|
||||||
|
|
||||||
|
- name: Copy config for synapse
|
||||||
|
file:
|
||||||
|
src: /srv/matrix-appservice-discord/discord-registration.yaml
|
||||||
|
dest: /etc/matrix-synapse/discord-registration.yaml
|
||||||
|
state: link
|
||||||
|
|
||||||
|
- name: Copy the daemon configuration
|
||||||
|
template:
|
||||||
|
src: bridge_discord.service
|
||||||
|
dest: /etc/systemd/system/bridge_discord.service
|
||||||
|
notify: Restart the discord bridge
|
||||||
|
|
||||||
|
- name: Enable the daemon
|
||||||
|
systemd:
|
||||||
|
name: bridge_discord
|
||||||
|
state: started
|
||||||
|
enabled: yes
|
15
roles/matrix-bridge-discord/templates/bridge_discord.service
Normal file
15
roles/matrix-bridge-discord/templates/bridge_discord.service
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
{{ ansible_managed | comment }}
|
||||||
|
|
||||||
|
[Unit]
|
||||||
|
Description = Discord Bridge
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Environment=NODE_PORT=3000
|
||||||
|
Type=simple
|
||||||
|
User=root
|
||||||
|
Restart=on-failure
|
||||||
|
WorkingDirectory=/srv/matrix-appservice-discord
|
||||||
|
ExecStart=npm start
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
114
roles/matrix-bridge-discord/templates/config.yaml
Normal file
114
roles/matrix-bridge-discord/templates/config.yaml
Normal file
|
@ -0,0 +1,114 @@
|
||||||
|
{{ ansible_managed | comment }}
|
||||||
|
|
||||||
|
bridge:
|
||||||
|
# Domain part of the bridge, e.g. matrix.org
|
||||||
|
domain: "{{ matrix_server_name }}"
|
||||||
|
# This should be your publicly-facing URL because Discord may use it to
|
||||||
|
# fetch media from the media store.
|
||||||
|
homeserverUrl: "https://{{ matrix_server_name }}"
|
||||||
|
# The TCP port on which the appservice runs on.
|
||||||
|
port: 9005
|
||||||
|
# Interval at which to process users in the 'presence queue'. If you have
|
||||||
|
# 5 users, one user will be processed every 500 milliseconds according to the
|
||||||
|
# value below. This has a minimum value of 250.
|
||||||
|
# WARNING: This has a high chance of spamming the homeserver with presence
|
||||||
|
# updates since it will send one each time somebody changes state or is online.
|
||||||
|
presenceInterval: 500
|
||||||
|
# Disable setting presence for 'ghost users' which means Discord users on Matrix
|
||||||
|
# will not be shown as away or online.
|
||||||
|
disablePresence: false
|
||||||
|
# Disable sending typing notifications when somebody on Discord types.
|
||||||
|
disableTypingNotifications: false
|
||||||
|
# Disable deleting messages on Discord if a message is redacted on Matrix.
|
||||||
|
disableDeletionForwarding: false
|
||||||
|
# Disable portal bridging, where Matrix users can search for unbridged Discord
|
||||||
|
# rooms on their Matrix server.
|
||||||
|
disablePortalBridging: false
|
||||||
|
# Enable users to bridge rooms using !discord commands. See
|
||||||
|
# https://t2bot.io/discord for instructions.
|
||||||
|
enableSelfServiceBridging: false
|
||||||
|
# Disable sending of read receipts for Matrix events which have been
|
||||||
|
# successfully bridged to Discord.
|
||||||
|
disableReadReceipts: false
|
||||||
|
# Disable Join Leave echos from matrix
|
||||||
|
disableJoinLeaveNotifications: false
|
||||||
|
# Disable Invite echos from matrix
|
||||||
|
disableInviteNotifications: false
|
||||||
|
# Auto-determine the language of code blocks (this can be CPU-intensive)
|
||||||
|
determineCodeLanguage: false
|
||||||
|
# Authentication configuration for the discord bot.
|
||||||
|
auth:
|
||||||
|
# This MUST be a string (wrapped in quotes)
|
||||||
|
clientID: "{{ matrix_bridge_discord_client_ID }}"
|
||||||
|
botToken: "{{ matrix_bridge_discord_botToken }}"
|
||||||
|
# You must enable "Privileged Gateway Intents" in your bot settings on discord.com (e.g. https://discord.com/developers/applications/12345/bot)
|
||||||
|
# for this to work
|
||||||
|
usePrivilegedIntents: true
|
||||||
|
logging:
|
||||||
|
# What level should the logger output to the console at.
|
||||||
|
console: "warn" #silly, verbose, info, http, warn, error, silent
|
||||||
|
lineDateFormat: "MMM-D HH:mm:ss.SSS" # This is in moment.js format
|
||||||
|
files:
|
||||||
|
- file: "debug.log"
|
||||||
|
disable:
|
||||||
|
- "PresenceHandler" # Will not capture presence logging
|
||||||
|
- file: "warn.log" # Will capture warnings
|
||||||
|
level: "warn"
|
||||||
|
- file: "botlogs.log" # Will capture logs from DiscordBot
|
||||||
|
level: "info"
|
||||||
|
enable:
|
||||||
|
- "DiscordBot"
|
||||||
|
database:
|
||||||
|
# You may either use SQLite or Postgresql for the bridge database, which contains
|
||||||
|
# important mappings for events and user puppeting configurations.
|
||||||
|
# Use the filename option for SQLite, or connString for Postgresql.
|
||||||
|
# If you are migrating, see https://github.com/Half-Shot/matrix-appservice-discord/blob/master/docs/howto.md#migrate-to-postgres-from-sqlite
|
||||||
|
# WARNING: You will almost certainly be fine with sqlite unless your bridge
|
||||||
|
# is in heavy demand and you suffer from IO slowness.
|
||||||
|
# filename: "discord.db"
|
||||||
|
connString: "postgresql://bridge_discor_user:{{ matrix_bridge_discord_postgre_user_pwd }}@localhost/bridge_discord"
|
||||||
|
room:
|
||||||
|
# Set the default visibility of alias rooms, defaults to "public".
|
||||||
|
# One of: "public", "private"
|
||||||
|
defaultVisibility: "private"
|
||||||
|
channel:
|
||||||
|
# Pattern of the name given to bridged rooms.
|
||||||
|
# Can use :guild for the guild name and :name for the channel name.
|
||||||
|
namePattern: "[Discord] :guild :name"
|
||||||
|
# Changes made to rooms when a channel is deleted.
|
||||||
|
deleteOptions:
|
||||||
|
# Prefix the room name with a string.
|
||||||
|
#namePrefix: "[Deleted]"
|
||||||
|
# Prefix the room topic with a string.
|
||||||
|
#topicPrefix: "This room has been deleted"
|
||||||
|
# Disable people from talking in the room by raising the event PL to 50
|
||||||
|
disableMessaging: false
|
||||||
|
# Remove the discord alias from the room.
|
||||||
|
unsetRoomAlias: true
|
||||||
|
# Remove the room from the directory.
|
||||||
|
unlistFromDirectory: true
|
||||||
|
# Set the room to be unavailable for joining without an invite.
|
||||||
|
setInviteOnly: true
|
||||||
|
# Make all the discord users leave the room.
|
||||||
|
ghostsLeave: true
|
||||||
|
limits:
|
||||||
|
# Delay in milliseconds between discord users joining a room.
|
||||||
|
roomGhostJoinDelay: 6000
|
||||||
|
# Lock timeout in milliseconds before sending messages to discord to avoid
|
||||||
|
# echos. Default is rather high as the lock will most likely time out
|
||||||
|
# before anyways.
|
||||||
|
# echos = (Copies of a sent message may arrive from discord before we've
|
||||||
|
# fininished handling it, causing us to echo it back to the room)
|
||||||
|
discordSendDelay: 1500
|
||||||
|
# Set a maximum of rooms to be bridged.
|
||||||
|
# roomCount: 20
|
||||||
|
ghosts:
|
||||||
|
# Pattern for the ghosts nick, available is :nick, :username, :tag and :id
|
||||||
|
nickPattern: ":nick"
|
||||||
|
# Pattern for the ghosts username, available is :username, :tag and :id
|
||||||
|
usernamePattern: ":username#:tag"
|
||||||
|
# Prometheus-compatible metrics endpoint
|
||||||
|
metrics:
|
||||||
|
enable: false
|
||||||
|
port: 9001
|
||||||
|
host: "127.0.0.1"
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 89fb99ebb7c35ec3c11ecd5e4fbb194817f9cae6
|
|
5
roles/matrix-bridge-facebook/handlers/main.yml
Normal file
5
roles/matrix-bridge-facebook/handlers/main.yml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
- name: Restart the facebook bridge
|
||||||
|
systemd:
|
||||||
|
name: bridge_facebook
|
||||||
|
state: restarted
|
81
roles/matrix-bridge-facebook/tasks/main.yml
Normal file
81
roles/matrix-bridge-facebook/tasks/main.yml
Normal file
|
@ -0,0 +1,81 @@
|
||||||
|
---
|
||||||
|
|
||||||
|
- name: Setup postgres
|
||||||
|
include_role:
|
||||||
|
name: postgre
|
||||||
|
vars:
|
||||||
|
postgres_users:
|
||||||
|
- name: bridge_facebook_user
|
||||||
|
password: "{{ matrix_bridge_facebook_postgre_user_pwd }}"
|
||||||
|
databases:
|
||||||
|
- name: bridge_facebook
|
||||||
|
owner: bridge_facebook_user
|
||||||
|
local: C
|
||||||
|
template: template0
|
||||||
|
no_log: true
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
apt:
|
||||||
|
name:
|
||||||
|
- python3
|
||||||
|
- python3-virtualenv
|
||||||
|
- python3-pip
|
||||||
|
state: latest
|
||||||
|
update_cache: true
|
||||||
|
register: apt_result
|
||||||
|
retries: 3
|
||||||
|
until: apt_result is succeeded
|
||||||
|
|
||||||
|
- name: Create the mautrix-facebook user
|
||||||
|
user:
|
||||||
|
name: mautrix-facebook
|
||||||
|
home: /opt/mautrix-facebook
|
||||||
|
password_lock: yes
|
||||||
|
system: yes
|
||||||
|
|
||||||
|
- name: Install bridge
|
||||||
|
become: yes
|
||||||
|
become_user: mautrix-facebook
|
||||||
|
pip:
|
||||||
|
name: mautrix-facebook[animated_stickers]
|
||||||
|
virtualenv: /opt/mautrix-facebook
|
||||||
|
virtualenv_command: virtualenv
|
||||||
|
virtualenv_python: /usr/bin/python3
|
||||||
|
|
||||||
|
- name: Configure the bridge
|
||||||
|
template:
|
||||||
|
src: config.yaml
|
||||||
|
dest: /opt/mautrix-facebook/config.yaml
|
||||||
|
owner: mautrix-facebook
|
||||||
|
group: nogroup
|
||||||
|
mode: '0600'
|
||||||
|
notify: Restart the facebook bridge
|
||||||
|
no_log: true
|
||||||
|
|
||||||
|
- name: Generate facebook-registration.yaml
|
||||||
|
become: yes
|
||||||
|
become_user: mautrix-facebook
|
||||||
|
shell:
|
||||||
|
cmd: "/opt/mautrix-facebook/bin/python -m mautrix_facebook -g"
|
||||||
|
chdir: /opt/mautrix-facebook
|
||||||
|
creates: /opt/mautrix-facebook/registration.yaml
|
||||||
|
notify: Restart synapse
|
||||||
|
no_log: true
|
||||||
|
|
||||||
|
- name: Copy config for synapse
|
||||||
|
file:
|
||||||
|
src: /opt/mautrix-facebook/registration.yaml
|
||||||
|
dest: /etc/matrix-synapse/facebook-registration.yaml
|
||||||
|
state: link
|
||||||
|
|
||||||
|
- name: Copy the daemon configuration
|
||||||
|
template:
|
||||||
|
src: bridge_facebook.service
|
||||||
|
dest: /etc/systemd/system/bridge_facebook.service
|
||||||
|
notify: Restart the facebook bridge
|
||||||
|
|
||||||
|
- name: Enable the daemon
|
||||||
|
systemd:
|
||||||
|
name: bridge_facebook
|
||||||
|
state: started
|
||||||
|
enabled: yes
|
|
@ -0,0 +1,12 @@
|
||||||
|
{{ ansible_managed | comment }}
|
||||||
|
|
||||||
|
[Unit]
|
||||||
|
Description=mautrix-facebook bridge
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
WorkingDirectory=~
|
||||||
|
ExecStart=/opt/mautrix-facebook/bin/python -m mautrix_facebook
|
||||||
|
User=mautrix-facebook
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
265
roles/matrix-bridge-facebook/templates/config.yaml
Normal file
265
roles/matrix-bridge-facebook/templates/config.yaml
Normal file
|
@ -0,0 +1,265 @@
|
||||||
|
{{ ansible_managed | comment }}
|
||||||
|
|
||||||
|
# Homeserver details
|
||||||
|
homeserver:
|
||||||
|
# The address that this appservice can use to connect to the homeserver.
|
||||||
|
address: "https://{{ matrix_server_name }}"
|
||||||
|
# The domain of the homeserver (for MXIDs, etc).
|
||||||
|
domain: "{{ matrix_server_name }}"
|
||||||
|
# Whether or not to verify the SSL certificate of the homeserver.
|
||||||
|
# Only applies if address starts with https://
|
||||||
|
verify_ssl: true
|
||||||
|
# Whether or not the homeserver supports asmux-specific endpoints,
|
||||||
|
# such as /_matrix/client/unstable/net.maunium.asmux/dms for atomically
|
||||||
|
# updating m.direct.
|
||||||
|
asmux: false
|
||||||
|
# Number of retries for all HTTP requests if the homeserver isn't reachable.
|
||||||
|
http_retry_count: 4
|
||||||
|
# The URL to push real-time bridge status to.
|
||||||
|
# If set, the bridge will make POST requests to this URL whenever a user's Facebook MQTT connection state changes.
|
||||||
|
# The bridge will use the appservice as_token to authorize requests.
|
||||||
|
status_endpoint:
|
||||||
|
|
||||||
|
# Application service host/registration related details
|
||||||
|
# Changing these values requires regeneration of the registration.
|
||||||
|
appservice:
|
||||||
|
# The address that the homeserver can use to connect to this appservice.
|
||||||
|
address: http://localhost:29319
|
||||||
|
|
||||||
|
# The hostname and port where this appservice should listen.
|
||||||
|
hostname: localhost
|
||||||
|
port: 29319
|
||||||
|
# The maximum body size of appservice API requests (from the homeserver) in mebibytes
|
||||||
|
# Usually 1 is enough, but on high-traffic bridges you might need to increase this to avoid 413s
|
||||||
|
max_body_size: 1
|
||||||
|
|
||||||
|
# The full URI to the database. Only Postgres is currently supported.
|
||||||
|
database: postgres://bridge_facebook_user:{{ matrix_bridge_facebook_postgre_user_pwd }}@localhost/bridge_facebook
|
||||||
|
# Additional arguments for asyncpg.create_pool()
|
||||||
|
# https://magicstack.github.io/asyncpg/current/api/index.html#asyncpg.pool.create_pool
|
||||||
|
database_opts:
|
||||||
|
min_size: 5
|
||||||
|
max_size: 10
|
||||||
|
|
||||||
|
# Public part of web server for out-of-Matrix interaction with the bridge.
|
||||||
|
public:
|
||||||
|
# Whether or not the public-facing endpoints should be enabled.
|
||||||
|
enabled: false
|
||||||
|
# The prefix to use in the public-facing endpoints.
|
||||||
|
prefix: /public
|
||||||
|
# The base URL where the public-facing endpoints are available. The prefix is not added
|
||||||
|
# implicitly.
|
||||||
|
external:
|
||||||
|
# Shared secret for integration managers such as mautrix-manager.
|
||||||
|
# If set to "generate", a random string will be generated on the next startup.
|
||||||
|
# If null, integration manager access to the API will not be possible.
|
||||||
|
shared_secret: {{ matrix_bridge_facebook_integration_manager_shared_secret }}
|
||||||
|
# Allow logging in within Matrix. If false, users can only log in using the web interface.
|
||||||
|
allow_matrix_login: true
|
||||||
|
|
||||||
|
# The unique ID of this appservice.
|
||||||
|
id: facebook
|
||||||
|
# Username of the appservice bot.
|
||||||
|
bot_username: facebookbot
|
||||||
|
# Display name and avatar for bot. Set to "remove" to remove display name/avatar, leave empty
|
||||||
|
# to leave display name/avatar as-is.
|
||||||
|
bot_displayname: Facebook bridge bot
|
||||||
|
bot_avatar: mxc://maunium.net/ygtkteZsXnGJLJHRchUwYWak
|
||||||
|
|
||||||
|
# Community ID for bridged users (changes registration file) and rooms.
|
||||||
|
# Must be created manually. Example: "+facebook:example.com"
|
||||||
|
community_id:
|
||||||
|
|
||||||
|
# Whether or not to receive ephemeral events via appservice transactions.
|
||||||
|
# Requires MSC2409 support (i.e. Synapse 1.22+).
|
||||||
|
# You should disable bridge -> sync_with_custom_puppets when this is enabled.
|
||||||
|
ephemeral_events: false
|
||||||
|
|
||||||
|
# Authentication tokens for AS <-> HS communication. Autogenerated; do not modify.
|
||||||
|
as_token: {{ matrix_bridge_facebook_as_token }}
|
||||||
|
hs_token: {{ matrix_bridge_facebook_hs_token }}
|
||||||
|
|
||||||
|
# Prometheus telemetry config. Requires prometheus-client to be installed.
|
||||||
|
metrics:
|
||||||
|
enabled: false
|
||||||
|
listen_port: 8000
|
||||||
|
|
||||||
|
# Bridge config
|
||||||
|
bridge:
|
||||||
|
# Localpart template of MXIDs for Facebook users.
|
||||||
|
# {userid} is replaced with the user ID of the Facebook user.
|
||||||
|
username_template: facebook_{userid}
|
||||||
|
# Localpart template for per-user room grouping community IDs.
|
||||||
|
# The bridge will create these communities and add all of the specific user's portals to the community.
|
||||||
|
# {localpart} is the MXID localpart and {server} is the MXID server part of the user.
|
||||||
|
# (Note that, by default, non-admins might not have your homeserver's permission to create
|
||||||
|
# communities. You should set `enable_group_creation: true` in homeserver.yaml to fix this.)
|
||||||
|
# `facebook_{localpart}={server}` is a good value.
|
||||||
|
community_template: facebook_{localpart}={server}
|
||||||
|
# Displayname template for Facebook users.
|
||||||
|
# {displayname} is replaced with the display name of the Facebook user
|
||||||
|
# as defined below in displayname_preference.
|
||||||
|
# Keys available for displayname_preference are also available here.
|
||||||
|
displayname_template: '{displayname} (FB)'
|
||||||
|
# Available keys:
|
||||||
|
# "name" (full name)
|
||||||
|
# "first_name"
|
||||||
|
# "last_name"
|
||||||
|
# "nickname"
|
||||||
|
# "own_nickname" (user-specific!)
|
||||||
|
displayname_preference:
|
||||||
|
- name
|
||||||
|
- first_name
|
||||||
|
|
||||||
|
# The prefix for commands. Only required in non-management rooms.
|
||||||
|
command_prefix: '!fb'
|
||||||
|
|
||||||
|
# Number of chats to sync (and create portals for) on startup/login.
|
||||||
|
# Set 0 to disable automatic syncing.
|
||||||
|
initial_chat_sync: 20
|
||||||
|
# Whether or not the Facebook users of logged in Matrix users should be
|
||||||
|
# invited to private chats when the user sends a message from another client.
|
||||||
|
invite_own_puppet_to_pm: false
|
||||||
|
# Whether or not to use /sync to get presence, read receipts and typing notifications
|
||||||
|
# when double puppeting is enabled
|
||||||
|
sync_with_custom_puppets: true
|
||||||
|
# Whether or not to update the m.direct account data event when double puppeting is enabled.
|
||||||
|
# Note that updating the m.direct event is not atomic (except with mautrix-asmux)
|
||||||
|
# and is therefore prone to race conditions.
|
||||||
|
sync_direct_chat_list: false
|
||||||
|
# Servers to always allow double puppeting from
|
||||||
|
double_puppet_server_map:
|
||||||
|
# Allow using double puppeting from any server with a valid client .well-known file.
|
||||||
|
double_puppet_allow_discovery: false
|
||||||
|
# Shared secrets for https://github.com/devture/matrix-synapse-shared-secret-auth
|
||||||
|
#
|
||||||
|
# If set, custom puppets will be enabled automatically for local users
|
||||||
|
# instead of users having to find an access token and run `login-matrix`
|
||||||
|
# manually.
|
||||||
|
# If using this for other servers than the bridge's server,
|
||||||
|
# you must also set the URL in the double_puppet_server_map.
|
||||||
|
login_shared_secret_map:
|
||||||
|
# Whether or not to bridge presence in both directions. Facebook allows users not to broadcast
|
||||||
|
# presence, but then it won't send other users' presence to the client.
|
||||||
|
presence: true
|
||||||
|
# Whether or not to update avatars when syncing all contacts at startup.
|
||||||
|
update_avatar_initial_sync: true
|
||||||
|
# End-to-bridge encryption support options. These require matrix-nio to be installed with pip
|
||||||
|
# and login_shared_secret to be configured in order to get a device for the bridge bot.
|
||||||
|
#
|
||||||
|
# Additionally, https://github.com/matrix-org/synapse/pull/5758 is required if using a normal
|
||||||
|
# application service.
|
||||||
|
encryption:
|
||||||
|
# Allow encryption, work in group chat rooms with e2ee enabled
|
||||||
|
allow: false
|
||||||
|
# Default to encryption, force-enable encryption in all portals the bridge creates
|
||||||
|
# This will cause the bridge bot to be in private chats for the encryption to work properly.
|
||||||
|
default: false
|
||||||
|
# Options for automatic key sharing.
|
||||||
|
key_sharing:
|
||||||
|
# Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled.
|
||||||
|
# You must use a client that supports requesting keys from other users to use this feature.
|
||||||
|
allow: false
|
||||||
|
# Require the requesting device to have a valid cross-signing signature?
|
||||||
|
# This doesn't require that the bridge has verified the device, only that the user has verified it.
|
||||||
|
# Not yet implemented.
|
||||||
|
require_cross_signing: false
|
||||||
|
# Require devices to be verified by the bridge?
|
||||||
|
# Verification by the bridge is not yet implemented.
|
||||||
|
require_verification: true
|
||||||
|
# Whether or not the bridge should send a read receipt from the bridge bot when a message has
|
||||||
|
# been sent to Facebook.
|
||||||
|
delivery_receipts: false
|
||||||
|
# Whether to allow inviting arbitrary mxids to portal rooms
|
||||||
|
allow_invites: false
|
||||||
|
# Settings for backfilling messages from Facebook.
|
||||||
|
backfill:
|
||||||
|
# Whether or not the Facebook users of logged in Matrix users should be
|
||||||
|
# invited to private chats when backfilling history from Facebook. This is
|
||||||
|
# usually needed to prevent rate limits and to allow timestamp massaging.
|
||||||
|
invite_own_puppet: true
|
||||||
|
# Maximum number of messages to backfill initially.
|
||||||
|
# Set to 0 to disable backfilling when creating portal.
|
||||||
|
initial_limit: 0
|
||||||
|
# Maximum number of messages to backfill if messages were missed while
|
||||||
|
# the bridge was disconnected.
|
||||||
|
# Set to 0 to disable backfilling missed messages.
|
||||||
|
missed_limit: 1000
|
||||||
|
# If using double puppeting, should notifications be disabled
|
||||||
|
# while the initial backfill is in progress?
|
||||||
|
disable_notifications: false
|
||||||
|
periodic_reconnect:
|
||||||
|
# Interval in seconds in which to automatically reconnect all users.
|
||||||
|
# This can be used to automatically mitigate the bug where Facebook stops sending messages.
|
||||||
|
# Set to -1 to disable periodic reconnections entirely.
|
||||||
|
interval: -1
|
||||||
|
# What to do in periodic reconnects. Either "refresh" or "reconnect"
|
||||||
|
mode: refresh
|
||||||
|
# Should even disconnected users be reconnected?
|
||||||
|
always: false
|
||||||
|
# The number of seconds that a disconnection can last without triggering an automatic re-sync
|
||||||
|
# and missed message backfilling when reconnecting.
|
||||||
|
# Set to 0 to always re-sync, or -1 to never re-sync automatically.
|
||||||
|
resync_max_disconnected_time: 5
|
||||||
|
# Whether or not temporary disconnections should send notices to the notice room.
|
||||||
|
# If this is false, disconnections will never send messages and connections will only send
|
||||||
|
# messages if it was disconnected for more than resync_max_disconnected_time seconds.
|
||||||
|
temporary_disconnect_notices: true
|
||||||
|
# Disable bridge notices entirely
|
||||||
|
disable_bridge_notices: false
|
||||||
|
# Whether or not the bridge should try to "refresh" the connection if a normal reconnection
|
||||||
|
# attempt fails.
|
||||||
|
refresh_on_reconnection_fail: false
|
||||||
|
# Set this to true to tell the bridge to re-send m.bridge events to all rooms on the next run.
|
||||||
|
# This field will automatically be changed back to false after it,
|
||||||
|
# except if the config file is not writable.
|
||||||
|
resend_bridge_info: false
|
||||||
|
# When using double puppeting, should muted chats be muted in Matrix?
|
||||||
|
mute_bridging: false
|
||||||
|
# Whether or not mute status and tags should only be bridged when the portal room is created.
|
||||||
|
tag_only_on_create: true
|
||||||
|
|
||||||
|
# Permissions for using the bridge.
|
||||||
|
# Permitted values:
|
||||||
|
# user - Use the bridge with puppeting.
|
||||||
|
# admin - Use and administrate the bridge.
|
||||||
|
# Permitted keys:
|
||||||
|
# * - All Matrix users
|
||||||
|
# domain - All users on that homeserver
|
||||||
|
# mxid - Specific user
|
||||||
|
permissions:
|
||||||
|
{{ matrix_server_name }}: user
|
||||||
|
{% for user in matrix_bridge_facebook_allowed_external_user %}
|
||||||
|
'{{ user }}': user
|
||||||
|
{% endfor %}
|
||||||
|
{% for admin in matrix_bridge_facebook_admins %}
|
||||||
|
'@{{ admin }}:{{ matrix_server_name }}': admin
|
||||||
|
{% endfor %}
|
||||||
|
logging:
|
||||||
|
version: 1
|
||||||
|
formatters:
|
||||||
|
colored:
|
||||||
|
(): mautrix_facebook.util.ColorFormatter
|
||||||
|
format: '[%(asctime)s] [%(levelname)s@%(name)s] %(message)s'
|
||||||
|
normal:
|
||||||
|
format: '[%(asctime)s] [%(levelname)s@%(name)s] %(message)s'
|
||||||
|
handlers:
|
||||||
|
file:
|
||||||
|
class: logging.handlers.RotatingFileHandler
|
||||||
|
formatter: normal
|
||||||
|
filename: ./mautrix-facebook.log
|
||||||
|
maxBytes: 10485760
|
||||||
|
backupCount: 10
|
||||||
|
console:
|
||||||
|
class: logging.StreamHandler
|
||||||
|
formatter: colored
|
||||||
|
loggers:
|
||||||
|
mau:
|
||||||
|
level: DEBUG
|
||||||
|
paho:
|
||||||
|
level: INFO
|
||||||
|
aiohttp:
|
||||||
|
level: INFO
|
||||||
|
root:
|
||||||
|
level: DEBUG
|
||||||
|
handlers: [file, console]
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 70675bec04af6bf456857c30687c5e57fa5e812a
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit b27360700e82dd14fc42de6bdffc3d80bf3fa975
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit c8e442e4a931acc2220e4406282925c2d4a48954
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit e5ce16268f165be36d4f2f893caf47f9bdb6f332
|
|
67
roles/postgre/tasks/main.yml
Normal file
67
roles/postgre/tasks/main.yml
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
---
|
||||||
|
- name: Install postgre and usefull packages
|
||||||
|
apt:
|
||||||
|
update_cache: yes
|
||||||
|
name:
|
||||||
|
- acl # Don't ask me, required by postgresql_user
|
||||||
|
- postgresql
|
||||||
|
- postgresql-contrib
|
||||||
|
- libpq-dev
|
||||||
|
- python3-dev
|
||||||
|
- python3-psycopg2
|
||||||
|
- libpq5
|
||||||
|
state: latest
|
||||||
|
register: apt_result
|
||||||
|
retries: 3
|
||||||
|
until: apt_result is succeeded
|
||||||
|
|
||||||
|
- name: Enable and start PostgreSQL
|
||||||
|
systemd:
|
||||||
|
name: postgresql.service
|
||||||
|
state: started
|
||||||
|
enabled: yes
|
||||||
|
|
||||||
|
- name: Create users
|
||||||
|
become: true
|
||||||
|
become_user: postgres
|
||||||
|
postgresql_user:
|
||||||
|
name: "{{ item.name }}"
|
||||||
|
encrypted: yes
|
||||||
|
password: "{{ item.password }}"
|
||||||
|
loop: "{{ postgres_users }}"
|
||||||
|
no_log: true
|
||||||
|
|
||||||
|
- name: Create databases
|
||||||
|
become: true
|
||||||
|
become_user: postgres
|
||||||
|
postgresql_db:
|
||||||
|
name: "{{ item.name }}"
|
||||||
|
encoding: UTF-8
|
||||||
|
owner: "{{ item.owner | default(omit) }}"
|
||||||
|
lc_collate: "{{ item.local | default(omit) }}"
|
||||||
|
lc_ctype: "{{ item.local | default(omit) }}"
|
||||||
|
template: "{{ item.template | default(omit) }}"
|
||||||
|
loop: "{{ databases }}"
|
||||||
|
|
||||||
|
- name: Set encoding
|
||||||
|
become: true
|
||||||
|
become_user: postgres
|
||||||
|
postgresql_query:
|
||||||
|
query: "ALTER ROLE {{ item }} SET client_encoding TO 'utf8'"
|
||||||
|
loop: "{{ postgres_users | map(attribute='name') }}"
|
||||||
|
|
||||||
|
- name: Set encoding
|
||||||
|
become: true
|
||||||
|
become_user: postgres
|
||||||
|
postgresql_query:
|
||||||
|
query: "ALTER ROLE {{ item }} SET default_transaction_isolation TO 'read committed'"
|
||||||
|
when: item.read_committed | default(false)
|
||||||
|
loop: "{{ postgres_users | map(attribute='name') }}"
|
||||||
|
|
||||||
|
- name: Set timezone
|
||||||
|
become: true
|
||||||
|
become_user: postgres
|
||||||
|
postgresql_query:
|
||||||
|
query: "ALTER ROLE {{ item }} SET timezone TO 'CET'"
|
||||||
|
loop: "{{ postgres_users | map(attribute='name') }}"
|
||||||
|
|
|
@ -35,13 +35,9 @@ server {
|
||||||
access_log /var/log/nginx/{{ item.from }}.log;
|
access_log /var/log/nginx/{{ item.from }}.log;
|
||||||
error_log /var/log/nginx/{{ item.from }}_error.log;
|
error_log /var/log/nginx/{{ item.from }}_error.log;
|
||||||
|
|
||||||
location ~ /\.git {
|
|
||||||
return 404;
|
|
||||||
}
|
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
root {{ item.folder }};
|
root {{ item.folder }};
|
||||||
try_files $uri $uri.html $uri/index.html 404;
|
try_files $uri $uri.html 404;
|
||||||
}
|
}
|
||||||
|
|
||||||
include /etc/nginx/mime.types;
|
include /etc/nginx/mime.types;
|
||||||
|
|
|
@ -1128,7 +1128,7 @@ room_prejoin_state:
|
||||||
#
|
#
|
||||||
app_service_config_files:
|
app_service_config_files:
|
||||||
{% for app_service in matrix_apps_services %}
|
{% for app_service in matrix_apps_services %}
|
||||||
- "/etc/matrix-synapse/registrations/{{ app_service }}-registration.yaml"
|
- "/etc/matrix-synapse/{{ app_service }}-registration.yaml"
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
# Uncomment to enable tracking of application service IP addresses. Implicitly
|
# Uncomment to enable tracking of application service IP addresses. Implicitly
|
||||||
|
|
Loading…
Reference in a new issue