From acd82c74fcafac0c17e63e712f49495b3b73419f Mon Sep 17 00:00:00 2001 From: Qing Xiong Date: Thu, 10 Aug 2023 11:36:20 +0800 Subject: [PATCH 1/3] Updated steps to set up firewall rules for AWS in 'en.json' Attached 'XXX' to 'outline_logXXX' in 'install_server.sh' --- package-lock.json | 2 +- src/server_manager/install_scripts/install_server.sh | 4 ++-- src/server_manager/messages/en.json | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index bf5b47760..1ce01ec73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20065,7 +20065,7 @@ }, "src/server_manager": { "name": "outline-manager", - "version": "1.14.0", + "version": "0.0.0-debug", "license": "Apache", "dependencies": { "@polymer/app-layout": "^3.0.0", diff --git a/src/server_manager/install_scripts/install_server.sh b/src/server_manager/install_scripts/install_server.sh index ff181885b..2bf7df75e 100755 --- a/src/server_manager/install_scripts/install_server.sh +++ b/src/server_manager/install_scripts/install_server.sh @@ -58,8 +58,8 @@ readonly SENTRY_LOG_FILE=${SENTRY_LOG_FILE:-} # - STDERR is only used in the event of a fatal error # - Detailed logs are recorded to this FULL_LOG, which is preserved if an error occurred. # - The most recent error is stored in LAST_ERROR, which is never preserved. -FULL_LOG="$(mktemp -t outline_logXXX)" -LAST_ERROR="$(mktemp -t outline_last_errorXXX)" +FULL_LOG="$(mktemp -t outline_logXXXXXX)" +LAST_ERROR="$(mktemp -t outline_last_errorXXXXXX)" readonly FULL_LOG LAST_ERROR function log_command() { diff --git a/src/server_manager/messages/en.json b/src/server_manager/messages/en.json index b9189ee08..062e252d7 100644 --- a/src/server_manager/messages/en.json +++ b/src/server_manager/messages/en.json @@ -4,9 +4,9 @@ "aws-lightsail-firewall-0": "Navigate to the {openLink}Amazon Lightsail{closeLink} instances screen.", "aws-lightsail-firewall-1": "Click the instance on which you want to host Outline.", "aws-lightsail-firewall-2": "Navigate to the 'Networking' tab.", - "aws-lightsail-firewall-3": "In the 'Firewall' section, click 'Add another'.", - "aws-lightsail-firewall-4": "Set 'Application' value to 'All TCP+UDP'.", - "aws-lightsail-firewall-5": "Click 'Save'.", + "aws-lightsail-firewall-3": "Scroll down to 'IPv6 firewall', then click 'Add rule'.", + "aws-lightsail-firewall-4": "Select 'All protocols' for 'Application'.", + "aws-lightsail-firewall-5": "Click 'Create' on the right to save your rule.", "cancel": "Cancel", "geo-amsterdam": "Amsterdam", "geo-bangalore": "Bangalore", From 04855fedbd7f213e091867dfa9458206c422cd53 Mon Sep 17 00:00:00 2001 From: QingXXiong <138102583+QingXXiong@users.noreply.github.com> Date: Fri, 11 Aug 2023 09:09:20 +0800 Subject: [PATCH 2/3] Fix the version value in package-lock.json Fix the version value, probably changed because of local build. --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 1ce01ec73..1a2435c7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20065,7 +20065,7 @@ }, "src/server_manager": { "name": "outline-manager", - "version": "0.0.0-debug", + "version": "1.14.0"", "license": "Apache", "dependencies": { "@polymer/app-layout": "^3.0.0", From 852b9b7c9e2d67888a3e6478aa766e99c2bc7480 Mon Sep 17 00:00:00 2001 From: QingXXiong <138102583+QingXXiong@users.noreply.github.com> Date: Fri, 11 Aug 2023 17:09:02 +0800 Subject: [PATCH 3/3] Update package-lock.json Refixed the extra quotes. --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 1a2435c7b..bf5b47760 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20065,7 +20065,7 @@ }, "src/server_manager": { "name": "outline-manager", - "version": "1.14.0"", + "version": "1.14.0", "license": "Apache", "dependencies": { "@polymer/app-layout": "^3.0.0",