- ![]()
-  %>)
+ 
+
diff --git a/api/http/handler/file/handler.go b/api/http/handler/file/handler.go
index 137a87c52..72f8604e8 100644
--- a/api/http/handler/file/handler.go
+++ b/api/http/handler/file/handler.go
@@ -10,16 +10,14 @@ import (
// Handler represents an HTTP API handler for managing static files.
type Handler struct {
http.Handler
- wasInstanceDisabled func() bool
}
// NewHandler creates a handler to serve static files.
-func NewHandler(assetPublicPath string, wasInstanceDisabled func() bool) *Handler {
+func NewHandler(assetPublicPath string) *Handler {
h := &Handler{
Handler: handlers.CompressHandler(
http.FileServer(http.Dir(assetPublicPath)),
),
- wasInstanceDisabled: wasInstanceDisabled,
}
return h
@@ -35,11 +33,6 @@ func isHTML(acceptContent []string) bool {
}
func (handler *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
- if handler.wasInstanceDisabled() && (r.RequestURI == "/" || r.RequestURI == "/index.html") {
- http.Redirect(w, r, "/timeout.html", http.StatusTemporaryRedirect)
- return
- }
-
if !isHTML(r.Header["Accept"]) {
w.Header().Set("Cache-Control", "max-age=31536000")
} else {
diff --git a/api/http/server.go b/api/http/server.go
index ad07cafc4..994c591a7 100644
--- a/api/http/server.go
+++ b/api/http/server.go
@@ -176,7 +176,7 @@ func (server *Server) Start() error {
var kubernetesHandler = kubehandler.NewHandler(requestBouncer, server.AuthorizationService, server.DataStore, server.JWTService, server.KubeClusterAccessService, server.KubernetesClientFactory)
- var fileHandler = file.NewHandler(filepath.Join(server.AssetsPath, "public"), adminMonitor.WasInstanceDisabled)
+ var fileHandler = file.NewHandler(filepath.Join(server.AssetsPath, "public"))
var endpointHelmHandler = helm.NewHandler(requestBouncer, server.DataStore, server.JWTService, server.KubernetesDeployer, server.HelmPackageManager, server.KubeClusterAccessService)
diff --git a/app/portainer/views/init/admin/initAdminController.js b/app/portainer/views/init/admin/initAdminController.js
index 6ddcff217..6549ca71f 100644
--- a/app/portainer/views/init/admin/initAdminController.js
+++ b/app/portainer/views/init/admin/initAdminController.js
@@ -9,8 +9,7 @@ angular.module('portainer.app').controller('InitAdminController', [
'EndpointService',
'BackupService',
'StatusService',
- 'REDIRECT_REASON_TIMEOUT',
- function ($scope, $state, Notifications, Authentication, StateManager, SettingsService, UserService, EndpointService, BackupService, StatusService, REDIRECT_REASON_TIMEOUT) {
+ function ($scope, $state, Notifications, Authentication, StateManager, SettingsService, UserService, EndpointService, BackupService, StatusService) {
$scope.uploadBackup = uploadBackup;
$scope.logo = StateManager.getState().application.logo;
@@ -61,7 +60,6 @@ angular.module('portainer.app').controller('InitAdminController', [
}
})
.catch(function error(err) {
- handleError(err);
Notifications.error('Failure', err, 'Unable to create administrator user');
})
.finally(function final() {
@@ -69,15 +67,6 @@ angular.module('portainer.app').controller('InitAdminController', [
});
};
- function handleError(err) {
- if (err.status === 303) {
- const headers = err.headers();
- if (headers && headers['redirect-reason'] === REDIRECT_REASON_TIMEOUT) {
- window.location.href = '/timeout.html';
- }
- }
- }
-
function createAdministratorFlow() {
UserService.administratorExists()
.then(function success(exists) {
@@ -105,7 +94,6 @@ angular.module('portainer.app').controller('InitAdminController', [
try {
await restoreAsyncFn();
} catch (err) {
- handleError(err);
Notifications.error('Failure', err, 'Unable to restore the backup');
$scope.state.backupInProgress = false;
@@ -117,7 +105,6 @@ angular.module('portainer.app').controller('InitAdminController', [
Notifications.success('The backup has successfully been restored');
$state.go('portainer.auth');
} catch (err) {
- handleError(err);
Notifications.error('Failure', err, 'Unable to check for status');
await wait(2);
location.reload();
diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
index 9a1004473..c86d53374 100644
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -108,14 +108,6 @@ module.exports = {
},
manifest: './assets/ico/manifest.json',
}),
- new HtmlWebpackPlugin({
- template: './app/timeout.ejs',
- filename: 'timeout.html',
- templateParameters: {
- name: pkg.name,
- author: pkg.author,
- },
- }),
new WebpackBuildNotifierPlugin({
title: 'Portainer build',
logo: path.resolve('./assets/favicon-32x32.png'),