DGNum/infrastructure
13
6
Fork 3
Code Issues 20 Pull requests 8 Projects 1 Releases Packages Wiki Activity Actions

fix(ds-fr): Switch to local storage

Browse source 
Also disable France Connect login
This commit is contained in:
Tom Hubrecht 2023-09-26 20:46:38 +02:00
parent 2857736e6b
commit 8cce7e19cb
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
machines/compute01/ds-fr/default.nix
View file

@ -17,14 +17,12 @@ in {
settings = { settings = {
APP_HOST = host; APP_HOST = host;
# TODO: use France Connect ? # Disable France Connect and Agent Connect
FRANCE_CONNECT_ENABLED = "disabled"; FRANCE_CONNECT_ENABLED = "disabled";
FC_PARTICULIER_ID = "demarches_dgn"; AGENT_CONNECT_ENABLED = "disabled";
FC_PARTICULIER_SECRET = "JD2MKKR3aMapqk1f27AcMZMy8sTW7ypRkqcegvf5TUy8bMRp";
FC_PARTICULIER_BASE_URL = "https://sso.dgnum.eu";
# S3 storage setup # S3 storage setup
ACTIVE_STORAGE_SERVICE = "garage"; ACTIVE_STORAGE_SERVICE = "local";
S3_ENDPOINT = "https://s3.dgnum.eu"; S3_ENDPOINT = "https://s3.dgnum.eu";
S3_BUCKET = "demarches-dgnum"; S3_BUCKET = "demarches-dgnum";
S3_REGION = "garage"; S3_REGION = "garage";
@ -39,9 +37,6 @@ in {
APPLICATION_SHORTNAME = "d-s.dgnum.eu"; APPLICATION_SHORTNAME = "d-s.dgnum.eu";
APPLICATION_BASE_URL = "https://${host}"; APPLICATION_BASE_URL = "https://${host}";
# Deactivate connexion methods
AGENT_CONNECT_ENABLED = "disabled";
# SMTP setup, TODO: Fix and stop using sendmail # SMTP setup, TODO: Fix and stop using sendmail
CLASSIC_SMTP_ENABLED = "enabled"; CLASSIC_SMTP_ENABLED = "enabled";
SMTP_HOST = "kurisu.lahfa.xyz"; SMTP_HOST = "kurisu.lahfa.xyz";
@ -57,7 +52,7 @@ in {
EQUIPE_EMAIL = "equipe@infra.dgnum.eu"; EQUIPE_EMAIL = "equipe@infra.dgnum.eu";
TECH_EMAIL = "tech@infra.dgnum.eu"; TECH_EMAIL = "tech@infra.dgnum.eu";
NO_REPLY_EMAIL = NO_REPLY_EMAIL =
''"Ne pas répondre <@infra.dgnum.eu>"''; ''"Ne pas répondre <demarches@infra.dgnum.eu>"'';
OLD_CONTACT_EMAIL = ""; OLD_CONTACT_EMAIL = "";
CONTACT_PHONE = ""; CONTACT_PHONE = "";

1
machines/compute01/ds-fr/module.nix
View file

@ -285,6 +285,7 @@ in {
"f '${cfg.logDir}/production.log' 0640 ${cfg.user} ${cfg.group} - -" "f '${cfg.logDir}/production.log' 0640 ${cfg.user} ${cfg.group} - -"
"f '${cfg.dataDir}/.env' 0600 ${cfg.user} ${cfg.group} - -" "f '${cfg.dataDir}/.env' 0600 ${cfg.user} ${cfg.group} - -"
"d '${cfg.dataDir}/tmp' 0700 ${cfg.user} ${cfg.group} 10d -" "d '${cfg.dataDir}/tmp' 0700 ${cfg.user} ${cfg.group} 10d -"
"d '${cfg.dataDir}/storage' 0700 ${cfg.user} ${cfg.group} - -"
]; ];
systemd.services = { systemd.services = {

3
machines/compute01/ds-fr/package/default.nix
View file

@ -97,9 +97,10 @@ in stdenv.mkDerivation {
patchShebangs bin/ patchShebangs bin/
rm -rf log rm -rf log storage
ln -s ${logDir} log ln -s ${logDir} log
ln -s ${dataDir}/tmp tmp ln -s ${dataDir}/tmp tmp
ln -s ${dataDir}/storage storage
for f in $(ls lib/tasks/deployment/); do for f in $(ls lib/tasks/deployment/); do
[[ ! ${initialDeploymentDate} < $f ]] \ [[ ! ${initialDeploymentDate} < $f ]] \