diff --git a/conf/manager.conf.in b/conf/manager.conf.in index a90cc13429e7f35433ea63223c2afa78596d46df..2a74e310a90094ca81c1f5417713f8af9a63f935 100644 --- a/conf/manager.conf.in +++ b/conf/manager.conf.in @@ -2,9 +2,7 @@ # Token validity period, in hours tokens_validity_period = 2 - [app] -url = https://my.fqdn/accountmanager support_email = support@my.fqdn [setup] diff --git a/lib/AccountManager/App.pm b/lib/AccountManager/App.pm index 1020ace1afca3ba2d13d1c27ac106697cf1d8b87..307e26ea3205e2d590f12b5586e9dbedfa22cf68 100644 --- a/lib/AccountManager/App.pm +++ b/lib/AccountManager/App.pm @@ -128,7 +128,7 @@ sub respond { my ($self, %in) = @_; $in{data}->{app} = { - url => $self->{configuration}->{app}->{url}, + url => $ENV{SCRIPT_NAME}, support_email => $self->{configuration}->{app}->{support_email}, version => $version, }; diff --git a/templates/web/en/home.tt2.html b/templates/web/en/home.tt2.html index 6c0a1e3de11377ea7ba236b8ee14cada867c4b0f..383425d1748be60e8d3a96148379bcc928efff0b 100644 --- a/templates/web/en/home.tt2.html +++ b/templates/web/en/home.tt2.html @@ -12,5 +12,5 @@ access own services.</p> <h2>Getting started</h2> <p>To start testing your own services, start by selecting one your are administrator for.</p> -<p class="text-center"><a href="?action=select_sp" class="button">Get started</a></p> +<p class="text-center"><a href="[% app.url %]?action=select_sp" class="button">Get started</a></p> diff --git a/templates/web/fr/home.tt2.html b/templates/web/fr/home.tt2.html index b8cb7565e9024110b0660a884a83841aebfe5114..1007a7f03c2c3526d720d767db05077ca1fb54ce 100644 --- a/templates/web/fr/home.tt2.html +++ b/templates/web/fr/home.tt2.html @@ -12,5 +12,5 @@ comptes de test ne peuvent être utilisés qu'avec ce service.</p> <h2>Commencer</h2> <p>Pour commencer à tester vos propres services, commencez par en sélectionner un dont vous êtes l'administrateur.</p> -<p class="text-center"><a href="?action=select_sp" class="button">Commencer</a></p> +<p class="text-center"><a href="[% app.url %]?action=select_sp" class="button">Commencer</a></p>