Attention ! Gitlab fournissant maintenant nativement des certificats Let’s Encrypt aux domaines personnalisés des Gitlab Pages, nous avons coupé notre service qui le faisait automatiquement pour vous.

Il est impératif, pour que votre domaine personnalisé continue à avoir un certificat Let’s Encrypt à jour, d’activer la fonctionnalité native dans les paramètres de votre projet. Cette activation remplacera votre certificat actuel par un nouveau certificat Let’s Encrypt géré par Gitlab.

Voir les détails sur https://docs.framasoft.org/fr/gitlab/gitlab-pages-le.html

Commit fc4b3d14 authored by Sebastien's avatar Sebastien

Path lib et chargement du fichier local.cfg

parent ddea8ee1
......@@ -44,14 +44,11 @@ MAIN:
$O_CONF->Update("$FindBin::RealBin/../../site/cfg/authentication.cfg", 'O');
my $local_cfg = undef;
$local_cfg = "$FindBin::RealBin/../../data/cfg/local.cfg" if (-e "$FindBin::RealBin/../../data/cfg/local.cfg");
$O_CONF->Update($local_cfg, 'O') if defined "$local_cfg";
$local_cfg = $ENV{'OC_DIR'} . '/data/cfg/local.cfg'
if (defined $ENV{'OC_DIR'} && -e $ENV{'OC_DIR'} . '/data/cfg/local.cfg');
$local_cfg = $ENV{'OC_DIR'} . '/data/cfg/local.cfg' if (defined $ENV{'OC_DIR'} && -e $ENV{'OC_DIR'} . '/data/cfg/local.cfg');
$O_CONF->Update($local_cfg, 'O') if defined "$local_cfg";
$local_cfg = $ENV{'OC_DIR'} . '/data/cfg/env.cfg'
if (defined $ENV{'OC_DIR'} && -e $ENV{'OC_DIR'} . '/data/cfg/env.cfg');
$local_cfg = $ENV{'OC_DIR'} . '/data/cfg/env.cfg' if (defined $ENV{'OC_DIR'} && -e $ENV{'OC_DIR'} . '/data/cfg/env.cfg');
$O_CONF->Update($local_cfg, 'O') if defined "$local_cfg";
&Sanitize();
......
......@@ -73,7 +73,15 @@ MAIN:
$O_CONF->Update("$FindBin::RealBin/../../site/cfg/site.cfg", 'O');
$O_CONF->Update("$FindBin::RealBin/../../site/cfg/authentication.cfg", 'O');
$O_CONF->Update("$FindBin::RealBin/data/cfg/local.cfg", 'O') if (-e "$FindBin::RealBin/data/cfg/local.cfg");
my $local_cfg = undef;
$local_cfg = "$FindBin::RealBin/../../data/cfg/local.cfg" if (-e "$FindBin::RealBin/../../data/cfg/local.cfg");
$O_CONF->Update($local_cfg, 'O') if defined "$local_cfg";
$local_cfg = $ENV{'OC_DIR'} . '/data/cfg/local.cfg' if (defined $ENV{'OC_DIR'} && -e $ENV{'OC_DIR'} . '/data/cfg/local.cfg');
$O_CONF->Update($local_cfg, 'O') if defined "$local_cfg";
$local_cfg = $ENV{'OC_DIR'} . '/data/cfg/env.cfg' if (defined $ENV{'OC_DIR'} && -e $ENV{'OC_DIR'} . '/data/cfg/env.cfg');
$O_CONF->Update($local_cfg, 'O') if defined "$local_cfg";
&Sanitize();
my $o_param = New ParamParser('GETOPTLONG', \&__Usage, 'former_email=s', 'new_email=s', 'verbose');
......
......@@ -2,8 +2,8 @@
use strict;
use FindBin;
use lib "$FindBin::RealBin/../../../lib/int/";
use lib "$FindBin::RealBin/../../../lib/ext/lipmutils";
use lib "$FindBin::RealBin/../../lib/int/";
use lib "$FindBin::RealBin/../../lib/ext/lipmutils";
use General;
use ParamParser;
......@@ -41,8 +41,17 @@ MAIN:
$O_CONF->SetSubstitution('%H', \$O_CONF->Get('portal_http_root'));
$O_CONF->Update("$FindBin::RealBin/../../site/cfg/site.cfg", 'O');
$O_CONF->Update("$FindBin::RealBin/../../site/cfg/authentication.cfg", 'O');
$O_CONF->Update("$FindBin::RealBin/data/cfg/local.cfg", 'O') if (-e "$FindBin::RealBin/data/cfg/local.cfg");
my $local_cfg = undef;
$local_cfg = "$FindBin::RealBin/../../data/cfg/local.cfg" if (-e "$FindBin::RealBin/../../data/cfg/local.cfg");
$O_CONF->Update($local_cfg, 'O') if defined "$local_cfg";
$local_cfg = $ENV{'OC_DIR'} . '/data/cfg/local.cfg' if (defined $ENV{'OC_DIR'} && -e $ENV{'OC_DIR'} . '/data/cfg/local.cfg');
$O_CONF->Update($local_cfg, 'O') if defined "$local_cfg";
$local_cfg = $ENV{'OC_DIR'} . '/data/cfg/env.cfg' if (defined $ENV{'OC_DIR'} && -e $ENV{'OC_DIR'} . '/data/cfg/env.cfg');
$O_CONF->Update($local_cfg, 'O') if defined "$local_cfg";
&Sanitize();
my $datarootdir = $O_CONF->Get('datarootdir');
my $cmd = "find $datarootdir -name 'analysis.json'";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment