Declare proxy as stable and enable by default
Change-Id: I06c574831d5ba7afa9948dfd54885d76774e7a2e
diff --git a/Changes b/Changes
index f71d471..9ba7de7 100755
--- a/Changes
+++ b/Changes
@@ -1,4 +1,4 @@
-0.38 2020-04-14
+0.38 2020-04-16
- Support X-Forwarded-Host name for proxy.
- Document API URI.
- Improve redirect handling in proxy.
@@ -10,6 +10,9 @@
- Support HTML responses for match information.
- Reuse failure template.
- Added support for OAuth2 client unregistration.
+ - Remove experimental status of proxy (and therefore
+ configuration option 'experimental_proxy') and enable
+ proxy by default.
0.37 2020-01-16
- Removed deprecated 'kalamar_test_port' helper.
diff --git a/Makefile.PL b/Makefile.PL
index ca7f350..4b5285b 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -14,7 +14,7 @@
},
LICENSE => 'freebsd',
PREREQ_PM => {
- 'Mojolicious' => '8.22',
+ 'Mojolicious' => '8.34',
'Mojolicious::Plugin::TagHelpers::Pagination' => 0.07,
'Mojolicious::Plugin::TagHelpers::MailToChiffre' => 0.10,
'Mojolicious::Plugin::ClosedRedirect' => 0.14,
diff --git a/kalamar.conf b/kalamar.conf
index 714c32b..95fed5b 100644
--- a/kalamar.conf
+++ b/kalamar.conf
@@ -57,9 +57,6 @@
## Require everything to be send via https only:
# https_only => 1,
- ## Add experimental features:
- # experimental_proxy => 1,
-
## Set proxy timeouts
# proxy_inactivity_timeout => 120,
# proxy_connect_timeout => 120,
diff --git a/lib/Kalamar.pm b/lib/Kalamar.pm
index e5553a0..6f83103 100644
--- a/lib/Kalamar.pm
+++ b/lib/Kalamar.pm
@@ -290,10 +290,8 @@
$r->get('/contact')->mail_to_chiffre('documentation#contact');
# API proxy route
- if ($conf->{experimental_proxy}) {
- $r->any('/api/v#apiv' => [apiv => ['1.0']])->name('proxy')->to('Proxy#pass');
- $r->any('/api/v#apiv/*path' => [apiv => ['1.0']])->to('Proxy#pass');
- }
+ $r->any('/api/v#apiv' => [apiv => ['1.0']])->name('proxy')->to('Proxy#pass');
+ $r->any('/api/v#apiv/*path' => [apiv => ['1.0']])->to('Proxy#pass');
# Match route
# Corpus route
diff --git a/t/doc.t b/t/doc.t
index 4fb7464..503c2a5 100644
--- a/t/doc.t
+++ b/t/doc.t
@@ -6,7 +6,6 @@
my $t = Test::Mojo->new('Kalamar' => {
Kalamar => {
- experimental_proxy => 1,
proxy_prefix => '/test'
}
});
diff --git a/t/proxy.t b/t/proxy.t
index 1dc1d08..2b16623 100644
--- a/t/proxy.t
+++ b/t/proxy.t
@@ -14,7 +14,6 @@
my $t = Test::Mojo->new('Kalamar' => {
Kalamar => {
plugins => ['Auth'],
- experimental_proxy => 1,
proxy_inactivity_timeout => 99,
proxy_connect_timeout => 66,
}
diff --git a/templates/doc/api.html.ep b/templates/doc/api.html.ep
index a7f1a30..54174e7 100644
--- a/templates/doc/api.html.ep
+++ b/templates/doc/api.html.ep
@@ -8,8 +8,6 @@
<p>All publicly available API endpoints including their requests and responses are described in the <%= ext_link_to 'GitHub Wiki', "https://github.com/KorAP/Kustvakt/wiki" %> of <%= embedded_link_to 'doc', 'Kustvakt', 'korap', 'kustvakt' %>.</p>
-% if (app->config('Kalamar')->{experimental_proxy}) {
-% my $api_url = $c->url_for('proxy' => (apiv => $Kalamar::API_VERSION))->to_abs->scheme('https');
-% $api_url->path->trailing_slash(1);
+% my $api_url = $c->url_for('proxy' => (apiv => $Kalamar::API_VERSION))->to_abs->scheme('https');
+% $api_url->path->trailing_slash(1);
<p>The root service can be found at <code id="api-service-uri"><%= $api_url %></code>.</p>
-% }