CERBERUS/outline-server
1
0
Fork 0
mirror of https://github.com/OutlineFoundation/outline-server.git synced 2026-10-24 13:31:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix formatting in shadowbox config (#562)

Browse source
This commit is contained in:
alalamav 2020-01-23 18:18:41 -05:00 • committed by GitHub
parent 674eafd472
commit 4b95dbd23f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/server_manager/install_scripts/install_server.sh
View file

@ -249,9 +249,10 @@ function join() {
function write_config() {
declare -a config=()
if [[ $FLAGS_KEYS_PORT != 0 ]]; then
config+=("\"portForNewAccessKeys\":$FLAGS_KEYS_PORT")
config+=("\"portForNewAccessKeys\": $FLAGS_KEYS_PORT")
fi
config+=$(printf '"hostname": "%q"' ${PUBLIC_HOSTNAME})
# printf is needed to escape the hostname.
config+=("$(printf '"hostname": "%q"' ${PUBLIC_HOSTNAME})")
echo "{"$(join , "${config[@]}")"}" > $STATE_DIR/shadowbox_server_config.json
}
@ -329,7 +330,7 @@ function add_api_url_to_config() {
function check_firewall() {
# TODO(cohenjon) This is incorrect if access keys are using more than one port.
local readonly ACCESS_KEY_PORT=$(curl --insecure -s ${LOCAL_API_URL}/access-keys |
local readonly ACCESS_KEY_PORT=$(curl --insecure -s ${LOCAL_API_URL}/access-keys |
docker exec -i shadowbox node -e '
const fs = require("fs");
const accessKeys = JSON.parse(fs.readFileSync(0, {encoding: "utf-8"}));