diff --git a/imageroot/actions/configure-module/validate-input.json b/imageroot/actions/configure-module/validate-input.json index d3bc6f8..0d27a73 100644 --- a/imageroot/actions/configure-module/validate-input.json +++ b/imageroot/actions/configure-module/validate-input.json @@ -17,7 +17,7 @@ "path": { "type": "string", "description": "web path for the web application, like '/sftpgo'", - "pattern": "^/?[a-zA-Z0-9_-]+/?$" + "pattern": "^/[a-zA-Z0-9_-]+" }, "http2https": { "type": "boolean", diff --git a/imageroot/actions/get-configuration/20read b/imageroot/actions/get-configuration/20read index 5b3bcfc..68625c9 100755 --- a/imageroot/actions/get-configuration/20read +++ b/imageroot/actions/get-configuration/20read @@ -65,7 +65,7 @@ configuration["hostname"] = agent.get_hostname() # Read current configuration configuration["sftp_tcp_port"] = int(os.environ.get("SFTP_TCP_PORT",3092)) -configuration["path"] = os.environ.get("TRAEFIK_PATH",'/sftpgo') +configuration["path"] = os.environ.get("TRAEFIK_PATH",'') configuration["http2https"] = os.environ.get("TRAEFIK_HTTP2HTTPS","False") == "True" # test if sftpgo port is externally enabled configuration["sftpgo_service"] = os.environ.get('SFTPGO_SERVICE', False) == "True" diff --git a/imageroot/actions/get-configuration/validate-output.json b/imageroot/actions/get-configuration/validate-output.json index 2bea7db..d2ec863 100644 --- a/imageroot/actions/get-configuration/validate-output.json +++ b/imageroot/actions/get-configuration/validate-output.json @@ -52,7 +52,7 @@ "path": { "type": "string", "description": "web path for the web application, like '/sftpgo'", - "pattern": "^/?[a-zA-Z0-9_-]+/?$" + "pattern": "^$|^/[a-zA-Z0-9_-]+" }, "hostname": { "description": "Host name of the node, like 'foo.domain.com'", diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json index 2c1b1e9..df0c9b5 100644 --- a/ui/public/i18n/en/translation.json +++ b/ui/public/i18n/en/translation.json @@ -108,7 +108,8 @@ "sftp_tcp_port_invalid_type": "The TCP port is not valid, it must be an integer in the range 1024-65535", "tcp_port_already_used": "The TCP port is already used by another service", "sftpgo_restrict_port_access": "SFTPGo external access", - "sftpgo_explanation_tooltips": "SFTPGo provides a user interface and a SFTP service for uploading your websites" + "sftpgo_explanation_tooltips": "SFTPGo provides a user interface and a SFTP service for uploading your websites", + "sftpgo_path_tips": "Enter a unique HTTP path, for example '/sftpgo'" }, "about": { "title": "About" diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue index 3a831f9..5d78e10 100644 --- a/ui/src/views/Settings.vue +++ b/ui/src/views/Settings.vue @@ -20,16 +20,25 @@