Commit graph

409 commits

Author SHA1 Message Date
09fc30214d Upgrade synapse as proposed 2020-09-16 15:52:19 +02:00
e9bc6fe7f1 Merge pull request 'ajout de adrien dans la config de l'os' (#20) from ajout-adrien into master
Reviewed-on: Deuxfleurs/deuxfleurs.fr#20
2020-09-14 23:20:47 +02:00
6b1a7127ce ajout de moi-meme dans la config de l'os 2020-09-14 23:12:54 +02:00
484c3fe667 Merge branch 'feature/rebase' 2020-09-13 12:03:07 +02:00
d5bfc38fe8 Final step for jitsi 2020-09-13 12:00:48 +02:00
d76d82fccb Use jre headless for more leightweight images 2020-09-13 09:48:04 +00:00
a1be6b31ed Increment once to be sure 2020-09-13 11:47:07 +02:00
da034dabfc Finally it seems to work 2020-09-13 11:46:14 +02:00
744fa8b8c9 Merge branch 'feature/rebase' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr into feature/rebase 2020-09-12 23:18:20 +02:00
c40095d02c WIP jitsi 2020-09-12 23:18:02 +02:00
7951d35035 WIP jitsi fix 2020-09-12 21:04:25 +00:00
1af6eabc81 Fix videobridge 2020-09-12 22:18:30 +02:00
51e4af08c0 Reformat markdown 2020-09-12 20:18:41 +02:00
a23e08ce20 Refactor 2 2020-09-12 20:17:07 +02:00
fb4ffbc7fa Fix broken Jitsi... 2020-09-12 18:01:34 +00:00
b00fc0eaf1 Use a more recent npm 2020-09-12 12:21:30 +02:00
0c05730a5d Rationalize container building 2020-09-12 11:27:32 +02:00
5337be94df Better handle jitsi versions 2020-09-12 11:15:07 +02:00
c4a6cf1534 Rebase first step 2020-09-12 10:03:48 +02:00
0550647b93 Updated natrix 2020-09-07 14:31:05 +02:00
30fe6d2e3c Final sogo upgrade 2020-08-20 10:39:10 +02:00
72b84fbe18 upgrade matrix + wip sogo 2020-08-20 10:01:44 +02:00
bdff5571f1 Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr 2020-07-16 09:04:56 +02:00
c29d660700 Migrate matrix+riot 2020-07-16 09:04:32 +02:00
f844c9454f Upgrade garage 2020-07-15 15:48:30 +02:00
2f1ef18510 WIP Florian as an admin 2020-07-13 21:04:03 +02:00
7ea74f2398 Merge branch 'feature/simpleiptables' 2020-07-13 20:03:13 +02:00
1782570408 Merge pull request 'update diplonat image' (#17) from update-diplonat into master
Reviewed-on: Deuxfleurs/deuxfleurs.fr#17
2020-07-13 20:02:18 +02:00
e25acda3d0 Rework file 2020-07-13 20:01:04 +02:00
75a72af70b Merge pull request 'Simplify iptables' (#16) from feature/simpleiptables into master
Reviewed-on: Deuxfleurs/deuxfleurs.fr#16
2020-07-13 19:59:17 +02:00
46aac4cc79 Add SSH 2020-07-13 19:58:49 +02:00
29d8414112 update diplonat image 2020-07-13 19:56:45 +02:00
4bd4d20533 Simplify iptables 2020-07-13 19:55:22 +02:00
c12dcd6d21 Add Florian 2020-07-13 18:51:40 +02:00
86e727eeb8 Add max as admin 2020-07-08 09:21:06 +02:00
e623bbcc6f Update Matrix 2020-07-06 13:58:25 +02:00
60e3958baf Rename postgres 2020-07-05 23:17:36 +02:00
3789532560 Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr 2020-07-05 23:15:50 +02:00
775bab3735 Start using preemption 2020-07-05 23:15:05 +02:00
c344dacb65 Add garage and nextcloud configuration 2020-07-05 22:55:00 +02:00
5e83c8e5fe Remove don't need anymore 2020-07-05 20:56:36 +02:00
09878271f2 Merge pull request 'Network configuration' (#1) from network_config into master
Reviewed-on: Deuxfleurs/deuxfleurs.fr#1
2020-07-05 20:37:19 +02:00
faf39bbb28 Fix docker volume 2020-07-05 20:36:16 +02:00
81480fa1f9 Add docs + fix warning 2020-07-05 20:15:28 +02:00
9cf37f9fe0 Clean nomad+consul deploy tasks as we do not deploy anymore on ARM so it is untested for real 2020-07-05 20:12:51 +02:00
6b37b7c932 Add a readme 2020-07-05 19:52:31 +02:00
03d4e50b05 Add my own modifications 2020-07-05 19:49:32 +02:00
eac2581a20 Merge branch 'master' into network_config 2020-07-05 19:42:00 +02:00
f427bcf564 Rename chat to im because of a nomad bug 2020-07-01 18:44:27 +02:00
d590a98bed Remove last reference to obsolete nomad1 interface 2020-06-30 17:31:35 +02:00