Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request 'ajout de adrien dans la config de l'os' (#20) from ↵ | Quentin | 2020-09-14 | 2 | -0/+6 |
|\ | | | | | | | | | | | ajout-adrien into master Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/deuxfleurs.fr/pulls/20 | ||||
| * | ajout de moi-meme dans la config de l'osajout-adrien | Adrien | 2020-09-14 | 2 | -0/+6 |
|/ | |||||
* | Merge branch 'feature/rebase' | Quentin | 2020-09-13 | 206 | -138/+203 |
|\ | |||||
| * | Final step for jitsifeature/rebase | Quentin | 2020-09-13 | 1 | -3/+3 |
| | | |||||
| * | Use jre headless for more leightweight images | Quentin Dufour | 2020-09-13 | 1 | -1/+1 |
| | | |||||
| * | Increment once to be sure | Quentin | 2020-09-13 | 1 | -3/+3 |
| | | |||||
| * | Finally it seems to work | Quentin | 2020-09-13 | 9 | -34/+55 |
| | | |||||
| * | Merge branch 'feature/rebase' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr ↵ | Quentin | 2020-09-12 | 4 | -2/+4 |
| |\ | | | | | | | | | | into feature/rebase | ||||
| | * | WIP jitsi fix | Quentin Dufour | 2020-09-12 | 4 | -2/+4 |
| | | | |||||
| * | | WIP jitsi | Quentin | 2020-09-12 | 1 | -2/+2 |
| |/ | |||||
| * | Fix videobridge | Quentin | 2020-09-12 | 5 | -14/+9 |
| | | |||||
| * | Reformat markdown | Quentin | 2020-09-12 | 1 | -6/+6 |
| | | |||||
| * | Refactor 2 | Quentin | 2020-09-12 | 199 | -8/+10 |
| | | |||||
| * | Fix broken Jitsi... | Quentin Dufour | 2020-09-12 | 3 | -4/+5 |
| | | |||||
| * | Use a more recent npm | Quentin | 2020-09-12 | 1 | -1/+3 |
| | | |||||
| * | Rationalize container building | Quentin | 2020-09-12 | 3 | -9/+13 |
| | | |||||
| * | Better handle jitsi versions | Quentin | 2020-09-12 | 6 | -32/+21 |
| | | |||||
| * | Rebase first step | Quentin | 2020-09-12 | 203 | -29/+78 |
|/ | |||||
* | Updated natrix | Quentin Dufour | 2020-09-07 | 2 | -6/+6 |
| | |||||
* | Final sogo upgrade | Quentin Dufour | 2020-08-20 | 2 | -2/+5 |
| | |||||
* | upgrade matrix + wip sogo | Quentin Dufour | 2020-08-20 | 4 | -8/+99 |
| | |||||
* | Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr | Quentin Dufour | 2020-07-16 | 1 | -2/+2 |
|\ | |||||
| * | Upgrade garage | Alex Auvolat | 2020-07-15 | 1 | -2/+2 |
| | | |||||
* | | Migrate matrix+riot | Quentin Dufour | 2020-07-16 | 2 | -6/+8 |
|/ | |||||
* | WIP Florian as an admin | Quentin Dufour | 2020-07-13 | 1 | -2/+3 |
| | |||||
* | Merge branch 'feature/simpleiptables' | Quentin Dufour | 2020-07-13 | 1 | -9/+6 |
|\ | |||||
| * | Rework filefeature/simpleiptables | Quentin Dufour | 2020-07-13 | 1 | -9/+6 |
| | | |||||
* | | Merge pull request 'update diplonat image' (#17) from update-diplonat into ↵ | Quentin | 2020-07-13 | 1 | -2/+3 |
|\ \ | | | | | | | | | | | | | | | | master Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/deuxfleurs.fr/pulls/17 | ||||
| * | | update diplonat imageupdate-diplonat | darkgallium | 2020-07-13 | 1 | -2/+3 |
| | | | |||||
* | | | Merge pull request 'Simplify iptables' (#16) from feature/simpleiptables ↵ | darkgallium | 2020-07-13 | 1 | -36/+1 |
|\ \ \ | |/ / |/| / | |/ | | | | | into master Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/deuxfleurs.fr/pulls/16 | ||||
| * | Add SSH | Quentin Dufour | 2020-07-13 | 1 | -0/+1 |
| | | |||||
| * | Simplify iptables | Quentin Dufour | 2020-07-13 | 1 | -36/+0 |
|/ | |||||
* | Add Florian | Quentin Dufour | 2020-07-13 | 3 | -0/+8 |
| | |||||
* | Add max as admin | Quentin | 2020-07-08 | 4 | -2/+6 |
| | |||||
* | Update Matrix | Quentin Dufour | 2020-07-06 | 2 | -6/+6 |
| | |||||
* | Rename postgres | Quentin Dufour | 2020-07-05 | 1 | -0/+0 |
| | |||||
* | Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr | Quentin Dufour | 2020-07-05 | 10 | -1/+353 |
|\ | |||||
| * | Add garage and nextcloud configuration | Alex Auvolat | 2020-07-05 | 10 | -1/+353 |
| | | |||||
* | | Start using preemption | Quentin Dufour | 2020-07-05 | 2 | -7/+3 |
|/ | |||||
* | Remove don't need anymore | Quentin Dufour | 2020-07-05 | 3 | -39/+0 |
| | |||||
* | Merge pull request 'Network configuration' (#1) from network_config into master | Quentin | 2020-07-05 | 18 | -181/+109 |
|\ | | | | | | | Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/deuxfleurs.fr/pulls/1 | ||||
| * | Fix docker volume | Quentin Dufour | 2020-07-05 | 2 | -1/+12 |
| | | |||||
| * | Add docs + fix warning | Quentin Dufour | 2020-07-05 | 2 | -1/+4 |
| | | |||||
| * | Clean nomad+consul deploy tasks as we do not deploy anymore on ARM so it is ↵ | Quentin Dufour | 2020-07-05 | 6 | -74/+6 |
| | | | | | | | | untested for real | ||||
| * | Add a readmenetwork_config | Quentin Dufour | 2020-07-05 | 2 | -49/+59 |
| | | |||||
| * | Add my own modifications | Quentin Dufour | 2020-07-05 | 4 | -17/+9 |
| | | |||||
| * | Merge branch 'master' into network_config | Quentin | 2020-07-05 | 1 | -1/+1 |
| |\ | |/ |/| | |||||
* | | Rename chat to im because of a nomad bug | Quentin Dufour | 2020-07-01 | 1 | -1/+1 |
| | | |||||
| * | Remove last reference to obsolete nomad1 interface | Alex Auvolat | 2020-06-30 | 1 | -1/+1 |
| | | |||||
| * | Network configuration: | Alex Auvolat | 2020-06-30 | 9 | -43/+23 |
|/ | | | | | | | | | | - Remove nomad interface (unused) - Deactivate systemd-resolved - Add dns_server to production nodes variables - Add recursors option to Consul so that it can resolve outside DNS queries - Use consul as a global DNS server for machines and containers, with the outside DNS as a fallback (see roles/consul/templates/resolv.conf.j2) |