fic/server
1
0
Fork 0
Code Issues Pull Requests 4 Releases Wiki Activity

fixkit: Ready for tomorrow

Browse Source
This commit is contained in:
nemunaire 2023-07-24 21:23:01 +02:00
parent 3e828ebbfc
commit 1ace4394b5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/hosts
View File

@ -8,7 +8,7 @@
10.10.10.2 deimos 10.10.10.2 deimos
172.17.1.2 nginx 172.17.1.2 nginx
172.17.1.3 frontend 172.17.1.3 receiver
172.17.1.4 auth 172.17.1.4 auth
127.0.0.1 localhost 127.0.0.1 localhost

6
docker-compose.yml
View File

@ -25,15 +25,15 @@ services:
networks: networks:
- fic-net - fic-net
volumes: volumes:
- /mnt/fic:/mnt/fic:ro - /mnt/fic:/mnt/fic
- dashboard:/srv/DASHBOARD - dashboard:/srv/DASHBOARD
- files:/srv/FILES - files:/srv/FILES
- generator:/srv/GENERATOR:ro - generator:/srv/GENERATOR:ro
- pki:/srv/PKI - pki:/srv/PKI
- settings:/srv/SETTINGS - settings:/srv/SETTINGS
- settingsdist:/srv/SETTINGSDIST - settingsdist:/srv/SETTINGSDIST
- submissions:/srv/submissions - submissions:/srv/submissions:ro
- teams:/srv/TEAMS:ro - teams:/srv/TEAMS
command: -baseurl /admin/ -localimport /mnt/fic -localimportsymlink command: -baseurl /admin/ -localimport /mnt/fic -localimportsymlink
depends_on: depends_on:
- mysql - mysql

8
fickit-backend.yml
View File

@ -181,7 +181,7 @@ services:
- /var/lib/fic/backups - /var/lib/fic/backups
- name: fic-admin - name: fic-admin
image: nemunaire/fic-admin:latest image: nemunaire/fic-admin:latest
command: ["/srv/admin", "-4real", "-bind=127.0.0.1:8081", "-baseurl=/admin/", "-localimport=/mnt/fic", "-timestampCheck=/srv/submissions", "-git-import-remote=git@gitlab.cri.epita.fr:ing/majeures/srs/fic/2023/challenges.git"] command: ["/srv/admin", "-4real", "-bind=127.0.0.1:8081", "-baseurl=/admin/", "-localimport=/mnt/fic", "-timestampCheck=/srv/submissions", "-git-import-remote=git@gitlab.cri.epita.fr:ing/majeures/srs/fic/2024/challenges.git"]
env: env:
- PATH=/usr/sbin:/usr/bin:/sbin:/bin - PATH=/usr/sbin:/usr/bin:/sbin:/bin
- MYSQL_HOST=db - MYSQL_HOST=db
@ -196,7 +196,7 @@ services:
- /var/lib/fic/pki:/srv/PKI - /var/lib/fic/pki:/srv/PKI
- /var/lib/fic/settings:/srv/SETTINGS - /var/lib/fic/settings:/srv/SETTINGS
- /var/lib/fic/submissions:/srv/submissions:ro - /var/lib/fic/submissions:/srv/submissions:ro
- /var/lib/fic/teams:/srv/TEAMS:ro - /var/lib/fic/teams:/srv/TEAMS
net: /run/netns/fic-admin net: /run/netns/fic-admin
pid: new pid: new
ipc: new ipc: new
@ -247,7 +247,7 @@ services:
- /var/lib/fic/submissions - /var/lib/fic/submissions
- /var/lib/fic/teams - /var/lib/fic/teams
- name: fic-dashboard - name: fic-dashboard
image: nemunaire/fic-dashboard:latest image: nemunaire/fic-dashboard:latest@sha256:1466b7d5acdaf43943fac9b0804b5d9b3a27ae4f83613f2df289401fafd8da35
command: ["/srv/dashboard", "-bind=:8082", "-restrict-to-ips=/srv/DASHBOARD/restricted-ips.json"] command: ["/srv/dashboard", "-bind=:8082", "-restrict-to-ips=/srv/DASHBOARD/restricted-ips.json"]
binds: binds:
- /etc/hosts:/etc/hosts:ro - /etc/hosts:/etc/hosts:ro
@ -272,7 +272,7 @@ services:
- MYSQL_PASSWORD=fic - MYSQL_PASSWORD=fic
binds: binds:
- /etc/hosts:/etc/hosts:ro - /etc/hosts:/etc/hosts:ro
- /var/lib/fic/generator:/srv/GENERATOR:ro - /var/lib/fic/generator:/srv/GENERATOR
- /var/lib/fic/teams:/srv/TEAMS - /var/lib/fic/teams:/srv/TEAMS
- /var/lib/fic/settingsdist:/srv/SETTINGSDIST:ro - /var/lib/fic/settingsdist:/srv/SETTINGSDIST:ro
net: /run/netns/fic-generator net: /run/netns/fic-generator

2
fickit-frontend.yml
View File

@ -56,7 +56,7 @@ onboot:
net: /run/netns/nginx net: /run/netns/nginx
- name: frontal-ip-setup # without bonding - name: frontal-ip-setup # without bonding
image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7 image: linuxkit/ip:c88e3272e3b12edec454e4720da8bb70a7655bc7
command: ["/bin/sh", "-c", "ip link set name bond-frontal eth3; ip link set bond-frontal up; ip a add 192.168.2.91/24 dev bond-frontal; ip a add 91.243.117.240/32 dev bond-frontal; ip r add default via 192.168.2.1; ip link add link bond-frontal name internet type vlan id 4; ip link set internet up;" ] command: ["/bin/sh", "-c", "ip link set name bond-frontal eth3; ip link set bond-frontal up; ip a add 10.42.192.3/24 dev bond-frontal; ip a add 91.243.117.240/32 dev bond-frontal; ip r add default via 10.42.192.1; ip link add link bond-frontal name internet type vlan id 4; ip link set internet up;" ]
net: /run/netns/nginx net: /run/netns/nginx
runtime: runtime:
interfaces: interfaces: