marek-miklewicz/dapostinstall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update da_cli.sh

Browse Source
This commit is contained in:
Marek Miklewicz
2024-08-30 13:11:25 +02:00
parent ef0c9ab757
commit 7d334095c6
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
da_cli.sh
Executable → Regular
+22 -22
View File
@@ -1,16 +1,15 @@
#!/bin/bash
#version 0.7.0
#version 0.8.0
#gedas@mc2.dev
### VARS ###
DEFAULTPACKAGE=NO_LIMIT
DEFAULTPACKAGE=NO-LIMIT
DNSMASTER="192.168.8.13" # IP address of this server that should be used on the client host for multiserver
DNSSLAVE="192.168.8.14" # the second DNS server. This server should be able to login to DNSSLAVE via ssh
DNSSLAVEPORT="22" # port for dnsslave
ADMINUSER="admin" # server main admin user
TRUSTED_IPS="127.0.0.1,185.242.134.92,185.242.134.93,185.242.134.94,193.177.165.192,193.177.165.193,193.177.165.194,193.177.165.195,193.177.165.196" #comma separated list of IP addresses
### END VARS ###
######### FUNCTIONS
createUser() {
@@ -54,7 +53,7 @@ createUser() {
EOF
)
#create user
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${ADMINUSER}")/CMD_ACCOUNT_USER?json=yes" --request "POST" --data "${CREATE_USER_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${ADMINUSER}")/CMD_ACCOUNT_USER?json=yes" --request "POST" --data "${CREATE_USER_JSON}"
}
deleteUser() {
@@ -81,7 +80,7 @@ deleteUser() {
}
EOF
)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${ADMINUSER}")/CMD_SELECT_USERS?json=yes" --request "POST" --data "${DELETE_USER_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${ADMINUSER}")/CMD_SELECT_USERS?json=yes" --request "POST" --data "${DELETE_USER_JSON}"
}
createDB() {
@@ -116,7 +115,7 @@ createDB() {
)
#create db
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_DB?json=yes" --request "POST" --data "${CREATE_DB_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_DB?json=yes" --request "POST" --data "${CREATE_DB_JSON}"
}
deleteDB() {
@@ -143,7 +142,7 @@ deleteDB() {
EOF
)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_DB?json=yes" --request "POST" --data "${DELETE_DB_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_DB?json=yes" --request "POST" --data "${DELETE_DB_JSON}"
}
@@ -173,7 +172,7 @@ createForwarder() {
EOF
)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_EMAIL_FORWARDER?json=yes" --request "POST" --data "${CREATE_FORWARDER_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_EMAIL_FORWARDER?json=yes" --request "POST" --data "${CREATE_FORWARDER_JSON}"
}
@@ -203,7 +202,7 @@ deleteForwarder() {
}
EOF
)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_EMAIL_FORWARDER?json=yes" --request "POST" --data "${DELETE_FORWARDER_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_EMAIL_FORWARDER?json=yes" --request "POST" --data "${DELETE_FORWARDER_JSON}"
}
createDomain() {
@@ -237,7 +236,7 @@ createDomain() {
}
EOF
)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_DOMAIN?json=yes" --request "POST" --data "${CREATE_DOMAIN_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_DOMAIN?json=yes" --request "POST" --data "${CREATE_DOMAIN_JSON}"
done
else
CREATE_DOMAIN_JSON=$(cat <<- EOF
@@ -252,7 +251,7 @@ createDomain() {
}
EOF
)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_DOMAIN?json=yes" --request "POST" --data "${CREATE_DOMAIN_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_DOMAIN?json=yes" --request "POST" --data "${CREATE_DOMAIN_JSON}"
fi
}
@@ -286,7 +285,7 @@ createDomain() {
}
EOF
)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_DOMAIN?json=yes" --request "POST" --data "${DELETE_DOMAIN_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_DOMAIN?json=yes" --request "POST" --data "${DELETE_DOMAIN_JSON}"
done
else
DELETE_DOMAIN_JSON=$(cat <<- EOF
@@ -301,7 +300,7 @@ createDomain() {
}
EOF
)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_DOMAIN?json=yes" --request "POST" --data "${DELETE_DOMAIN_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_DOMAIN?json=yes" --request "POST" --data "${DELETE_DOMAIN_JSON}"
fi
}
@@ -389,7 +388,7 @@ createmailbox() {
USERNAME=$(grep -E "^${DOMAIN}:" -m1 /etc/virtual/domainowners | cut -f2 -d: | xargs)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_EMAIL_POP?json=yes" --request "POST" --data "${JSON_DATA}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_EMAIL_POP?json=yes" --request "POST" --data "${JSON_DATA}"
}
createmail() {
@@ -457,7 +456,7 @@ deletemail() {
USERNAME=$(grep -E "^${DOMAIN}:" -m1 /etc/virtual/domainowners | cut -f2 -d: | xargs)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_EMAIL_POP?json=yes" --request "POST" --data "${DELETE_EMAIL_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_EMAIL_POP?json=yes" --request "POST" --data "${DELETE_EMAIL_JSON}"
}
enabledkim() {
@@ -483,7 +482,7 @@ enabledkim() {
USERNAME=$(grep -E "^${DOMAIN}:" -m1 /etc/virtual/domainowners | cut -f2 -d: | xargs)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_EMAIL_POP?json=yes" --request "POST" --data "${ENABLE_DKIM_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_EMAIL_POP?json=yes" --request "POST" --data "${ENABLE_DKIM_JSON}"
}
@@ -510,7 +509,7 @@ disabledkim() {
USERNAME=$(grep -E "^${DOMAIN}:" -m1 /etc/virtual/domainowners | cut -f2 -d: | xargs)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_EMAIL_POP?json=yes" --request "POST" --data "${DISABLE_DKIM_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_EMAIL_POP?json=yes" --request "POST" --data "${DISABLE_DKIM_JSON}"
}
changemailpass() {
@@ -544,7 +543,7 @@ changemailpass() {
USERNAME=$(grep -E "^${DOMAIN}:" -m1 /etc/virtual/domainowners | cut -f2 -d: | xargs)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_EMAIL_POP?json=yes" --request "POST" --data "${CHANGE_EMAIL_PASS_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_EMAIL_POP?json=yes" --request "POST" --data "${CHANGE_EMAIL_PASS_JSON}"
}
changeuserpass() {
@@ -572,7 +571,7 @@ changeuserpass() {
EOF
)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${ADMINUSER}")/CMD_USER_PASSWD?json=yes" --request "POST" --data "${CHANGE_USER_PASS_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${ADMINUSER}")/CMD_USER_PASSWD?json=yes" --request "POST" --data "${CHANGE_USER_PASS_JSON}"
}
disablenamed() {
@@ -717,7 +716,7 @@ enablemultiserver() {
EOF
)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${ADMINUSER}")/CMD_MULTI_SERVER?json=yes" --request "POST" --data "${ENABLE_MULTISERVER_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${ADMINUSER}")/CMD_MULTI_SERVER?json=yes" --request "POST" --data "${ENABLE_MULTISERVER_JSON}"
}
@@ -732,7 +731,7 @@ disablemultiserver() {
EOF
)
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${ADMINUSER}")/CMD_MULTI_SERVER?json=yes" --request "POST" --data "${DISABLE_MULTISERVER_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${ADMINUSER}")/CMD_MULTI_SERVER?json=yes" --request "POST" --data "${DISABLE_MULTISERVER_JSON}"
}
@@ -985,7 +984,7 @@ phpSet () {
EOF
)
printf "\nDOMAIN: %s " "${DOMAIN}"
curl -k -X -u "$(/usr/local/directadmin/directadmin --root-auth-url-for="${USERNAME}")/CMD_DOMAIN?json=yes" --request "POST" --data "${PHPSELECT_JSON}"
curl -k -X -u "$(/usr/local/directadmin/directadmin root-auth-url --user="${USERNAME}")/CMD_DOMAIN?json=yes" --request "POST" --data "${PHPSELECT_JSON}"
done
}
@@ -1427,3 +1426,4 @@ case "$1" in
createemptybackup) createemptybackup ;;
*) listFunctions ;;
esac