aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request 'ajout de adrien dans la config de l'os' (#20) from ↵Quentin2020-09-142-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-adrienAdrien2020-09-142-0/+6
|/
* Merge branch 'feature/rebase'Quentin2020-09-13206-138/+203
|\
| * Final step for jitsifeature/rebaseQuentin2020-09-131-3/+3
| |
| * Use jre headless for more leightweight imagesQuentin Dufour2020-09-131-1/+1
| |
| * Increment once to be sureQuentin2020-09-131-3/+3
| |
| * Finally it seems to workQuentin2020-09-139-34/+55
| |
| * Merge branch 'feature/rebase' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.fr ↵Quentin2020-09-124-2/+4
| |\ | | | | | | | | | into feature/rebase
| | * WIP jitsi fixQuentin Dufour2020-09-124-2/+4
| | |
| * | WIP jitsiQuentin2020-09-121-2/+2
| |/
| * Fix videobridgeQuentin2020-09-125-14/+9
| |
| * Reformat markdownQuentin2020-09-121-6/+6
| |
| * Refactor 2Quentin2020-09-12199-8/+10
| |
| * Fix broken Jitsi...Quentin Dufour2020-09-123-4/+5
| |
| * Use a more recent npmQuentin2020-09-121-1/+3
| |
| * Rationalize container buildingQuentin2020-09-123-9/+13
| |
| * Better handle jitsi versionsQuentin2020-09-126-32/+21
| |
| * Rebase first stepQuentin2020-09-12203-29/+78
|/
* Updated natrixQuentin Dufour2020-09-072-6/+6
|
* Final sogo upgradeQuentin Dufour2020-08-202-2/+5
|
* upgrade matrix + wip sogoQuentin Dufour2020-08-204-8/+99
|
* Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.frQuentin Dufour2020-07-161-2/+2
|\
| * Upgrade garageAlex Auvolat2020-07-151-2/+2
| |
* | Migrate matrix+riotQuentin Dufour2020-07-162-6/+8
|/
* WIP Florian as an adminQuentin Dufour2020-07-131-2/+3
|
* Merge branch 'feature/simpleiptables'Quentin Dufour2020-07-131-9/+6
|\
| * Rework filefeature/simpleiptablesQuentin Dufour2020-07-131-9/+6
| |
* | Merge pull request 'update diplonat image' (#17) from update-diplonat into ↵Quentin2020-07-131-2/+3
|\ \ | | | | | | | | | | | | | | | master Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/deuxfleurs.fr/pulls/17
| * | update diplonat imageupdate-diplonatdarkgallium2020-07-131-2/+3
| | |
* | | Merge pull request 'Simplify iptables' (#16) from feature/simpleiptables ↵darkgallium2020-07-131-36/+1
|\ \ \ | |/ / |/| / | |/ | | | | into master Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/deuxfleurs.fr/pulls/16
| * Add SSHQuentin Dufour2020-07-131-0/+1
| |
| * Simplify iptablesQuentin Dufour2020-07-131-36/+0
|/
* Add FlorianQuentin Dufour2020-07-133-0/+8
|
* Add max as adminQuentin2020-07-084-2/+6
|
* Update MatrixQuentin Dufour2020-07-062-6/+6
|
* Rename postgresQuentin Dufour2020-07-051-0/+0
|
* Merge branch 'master' of git.deuxfleurs.fr:Deuxfleurs/deuxfleurs.frQuentin Dufour2020-07-0510-1/+353
|\
| * Add garage and nextcloud configurationAlex Auvolat2020-07-0510-1/+353
| |
* | Start using preemptionQuentin Dufour2020-07-052-7/+3
|/
* Remove don't need anymoreQuentin Dufour2020-07-053-39/+0
|
* Merge pull request 'Network configuration' (#1) from network_config into masterQuentin2020-07-0518-181/+109
|\ | | | | | | Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/deuxfleurs.fr/pulls/1
| * Fix docker volumeQuentin Dufour2020-07-052-1/+12
| |
| * Add docs + fix warningQuentin Dufour2020-07-052-1/+4
| |
| * Clean nomad+consul deploy tasks as we do not deploy anymore on ARM so it is ↵Quentin Dufour2020-07-056-74/+6
| | | | | | | | untested for real
| * Add a readmenetwork_configQuentin Dufour2020-07-052-49/+59
| |
| * Add my own modificationsQuentin Dufour2020-07-054-17/+9
| |
| * Merge branch 'master' into network_configQuentin2020-07-051-1/+1
| |\ | |/ |/|
* | Rename chat to im because of a nomad bugQuentin Dufour2020-07-011-1/+1
| |
| * Remove last reference to obsolete nomad1 interfaceAlex Auvolat2020-06-301-1/+1
| |
| * Network configuration:Alex Auvolat2020-06-309-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)