mirror of
https://github.com/xxoommd/magic.git
synced 2025-07-12 10:08:53 +00:00
updat scripts; update x to v0.3
This commit is contained in:
@ -27,19 +27,19 @@ function is_valid_domain() {
|
||||
fi
|
||||
}
|
||||
|
||||
echo -e "\n[INFO] Validate DOMAN: ${BLUE}${DEPLOY_DOMAIN}${NC} ..."
|
||||
echo -e "\n[INFO] Validate DOMAN: ${BLUE}${DOMAIN}${NC} ..."
|
||||
|
||||
if [[ -z $DEPLOY_DOMAIN ]]; then
|
||||
if [[ -z $DOMAIN ]]; then
|
||||
echo
|
||||
echo "[${RED}Err${NC}] DEPLOY_DOMAIN is not set"
|
||||
echo "[${RED}Err${NC}] DOMAIN is not set"
|
||||
echo
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if is_valid_domain "$DEPLOY_DOMAIN"; then
|
||||
echo -e "[INFO] ${BLUE}${UNDERLINE}$DEPLOY_DOMAIN${NC} is a valid domain.\n"
|
||||
if is_valid_domain "$DOMAIN"; then
|
||||
echo -e "[INFO] ${BLUE}${UNDERLINE}$DOMAIN${NC} is a valid domain.\n"
|
||||
else
|
||||
echo -e "[${RED}ERR${NC}] ${BLUE}${UNDERLINE}$DEPLOY_DOMAIN${NC} is not a valid domain. Abort."
|
||||
echo -e "[${RED}ERR${NC}] ${BLUE}${UNDERLINE}$DOMAIN${NC} is not a valid domain. Abort."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -67,9 +67,9 @@ if [ ! -d "${WORKING_DIR}" ]; then
|
||||
fi
|
||||
|
||||
CADDY_STORAGE="${WORKING_DIR}/caddy"
|
||||
CERT_DIR="$CADDY_STORAGE/certificates/acme-v02.api.letsencrypt.org-directory/$DEPLOY_DOMAIN"
|
||||
CRT_FILE="$CERT_DIR/$DEPLOY_DOMAIN.crt"
|
||||
KEY_FILE="$CERT_DIR/$DEPLOY_DOMAIN.key"
|
||||
CERT_DIR="$CADDY_STORAGE/certificates/acme-v02.api.letsencrypt.org-directory/$DOMAIN"
|
||||
CRT_FILE="$CERT_DIR/$DOMAIN.crt"
|
||||
KEY_FILE="$CERT_DIR/$DOMAIN.key"
|
||||
HY_CONFIG_FILE="${WORKING_DIR}/hy-config.yaml"
|
||||
CADDY_CONFIG_FILE="${WORKING_DIR}/Caddyfile"
|
||||
|
||||
@ -86,8 +86,8 @@ cat >${CADDY_CONFIG_FILE} <<EOF
|
||||
storage file_system $CADDY_STORAGE
|
||||
}
|
||||
|
||||
:443, ${DEPLOY_DOMAIN}
|
||||
tls xxoommd@${DEPLOY_DOMAIN}
|
||||
:443, ${DOMAIN}
|
||||
tls xxoommd@${DOMAIN}
|
||||
route {
|
||||
forward_proxy {
|
||||
basic_auth xxoommd fuckyouall
|
||||
@ -96,7 +96,7 @@ tls xxoommd@${DEPLOY_DOMAIN}
|
||||
probe_resistance
|
||||
# upstream socks5://127.0.0.1:40000
|
||||
}
|
||||
respond "hello ${DEPLOY_DOMAIN}@naive!"
|
||||
respond "hello ${DOMAIN}@naive!"
|
||||
}
|
||||
EOF
|
||||
echo -e "[INFO] Generate Done\n"
|
||||
@ -113,7 +113,7 @@ auth:
|
||||
masquerade:
|
||||
type: string
|
||||
string:
|
||||
content: 'hello ${DEPLOY_DOMAIN}@hysteria2'
|
||||
content: 'hello ${DOMAIN}@hysteria2'
|
||||
headers:
|
||||
content-type: text/plain
|
||||
custom-stuff: ice cream so good
|
||||
|
Reference in New Issue
Block a user