From 6ab4d1fd98e78cb137dd5ed49d66d462c95855f9 Mon Sep 17 00:00:00 2001 From: Cold-Egg Date: Fri, 6 Mar 2020 12:07:12 -0500 Subject: [PATCH] help/param msg update --- bin/appinstall.sh | 2 +- bin/container/appinstallctl.sh | 22 ++++++++++++++++------ bin/container/domainctl.sh | 21 ++++++++++++++++----- bin/container/owaspctl.sh | 27 +++++++++++++++++++-------- bin/container/serialctl.sh | 19 ++++++++++++++----- bin/demosite.sh | 2 +- bin/domain.sh | 4 ++-- bin/webadmin.sh | 6 +++--- 8 files changed, 72 insertions(+), 31 deletions(-) diff --git a/bin/appinstall.sh b/bin/appinstall.sh index a612980..a028e41 100755 --- a/bin/appinstall.sh +++ b/bin/appinstall.sh @@ -27,7 +27,7 @@ check_input(){ } app_download(){ - docker-compose exec litespeed su -c "appinstallctl.sh -app ${1} -domain ${2}" + docker-compose exec litespeed su -c "appinstallctl.sh --app ${1} --domain ${2}" bash bin/webadmin.sh -r exit 0 } diff --git a/bin/container/appinstallctl.sh b/bin/container/appinstallctl.sh index 66c11e0..5301dae 100755 --- a/bin/container/appinstallctl.sh +++ b/bin/container/appinstallctl.sh @@ -11,11 +11,21 @@ PUB_IP=$(curl -s http://checkip.amazonaws.com) DB_HOST='mysql' PLUGINLIST="litespeed-cache.zip" THEME='twentytwenty' +EPACE=' ' + +echow(){ + FLAG=${1} + shift + echo -e "\033[1m${EPACE}${FLAG}\033[0m${@}" +} help_message(){ - echo 'Command [-app app_name] [-domain domain_name]' - echo 'Example: appinstallctl.sh -app wordpress -d example.com' - exit 0 + echo -e "\033[1mOPTIONS\033[0m" + echow '-A, -app [wordpress] -D, --domain [DOMAIN_NAME]' + echo "${EPACE}${EPACE}Example: appinstallctl.sh --app wordpress --domain example.com" + echow '-H, --help' + echo "${EPACE}${EPACE}Display help and exit." + exit 0 } check_input(){ @@ -276,15 +286,15 @@ while [ ! -z "${1}" ]; do -[hH] | -help | --help) help_message ;; - -app | -a | -A) shift + -[aA] | -app | --app) shift check_input "${1}" APP_NAME="${1}" ;; - -d | -D | -domain) shift + -[dD] | -domain | --domain) shift check_input "${1}" DOMAIN="${1}" ;; - -vhname) shift + -vhname | --vhname) shift VHNAME="${1}" ;; *) diff --git a/bin/container/domainctl.sh b/bin/container/domainctl.sh index b3e9825..caed2f1 100755 --- a/bin/container/domainctl.sh +++ b/bin/container/domainctl.sh @@ -3,11 +3,22 @@ CK_RESULT='' LSDIR='/usr/local/lsws' LS_HTTPD_CONF="${LSDIR}/conf/httpd_config.xml" OLS_HTTPD_CONF="${LSDIR}/conf/httpd_config.conf" +EPACE=' ' + +echow(){ + FLAG=${1} + shift + echo -e "\033[1m${EPACE}${FLAG}\033[0m${@}" +} help_message(){ - echo 'Command [-add|-del] [domain_name]' - echo 'Example 1: domainctl.sh -add example.com' - echo 'Example 2: domainctl.sh -del example.com' + echo -e "\033[1mOPTIONS\033[0m" + echow '-A, --add [DOMAIN_NAME]' + echo "${EPACE}${EPACE}Will add domain to listener and creat a virtual host from template" + echow '-D, --del [DOMAIN_NAME]' + echo "${EPACE}${EPACE}Will delete domain from listener" + echow '-H, --help' + echo "${EPACE}${EPACE}Display help." } check_lsv(){ @@ -135,10 +146,10 @@ while [ ! -z "${1}" ]; do -[hH] | -help | --help) help_message ;; - -add | -a | -A) shift + -[aA] | -add | --add) shift add_domain ${1} ;; - -del | -d | -D | -delete) shift + -[dD] | -del | --del | --delete) shift del_domain ${1} ;; *) diff --git a/bin/container/owaspctl.sh b/bin/container/owaspctl.sh index fa825be..283108c 100755 --- a/bin/container/owaspctl.sh +++ b/bin/container/owaspctl.sh @@ -4,11 +4,22 @@ OWASP_DIR="${LSDIR}/conf/owasp" RULE_FILE='modsec_includes.conf' LS_HTTPD_CONF="${LSDIR}/conf/httpd_config.xml" OLS_HTTPD_CONF="${LSDIR}/conf/httpd_config.conf" +EPACE=' ' + +echow(){ + FLAG=${1} + shift + echo -e "\033[1m${EPACE}${FLAG}\033[0m${@}" +} help_message(){ - echo 'Command [-enable|-disable]' - echo 'Example: owaspctl.sh -enable' - echo 'Enable mod_secure module with latest OWASP version of rules' + echo -e "\033[1mOPTIONS\033[0m" + echow '-E, --enable' + echo "${EPACE}${EPACE}Will Enable mod_secure module with latest OWASP version of rules" + echow '-D, --disable' + echo "${EPACE}${EPACE}Will Disable mod_secure module with latest OWASP version of rules" + echow '-H, --help' + echo "${EPACE}${EPACE}Display help and exit." exit 0 } @@ -118,6 +129,7 @@ disable_ls_modesec(){ } disable_modsec(){ + check_lsv if [ "${LSV}" = 'lsws' ]; then disable_ls_modesec elif [ "${LSV}" = 'openlitespeed' ]; then @@ -195,6 +207,8 @@ main_owasp(){ install_git install_owasp configure_owasp + check_lsv + enable_modsec } check_input ${1} @@ -203,13 +217,10 @@ while [ ! -z "${1}" ]; do -[hH] | -help | --help) help_message ;; - -enable | -e | -E) + -[eE] | -enable | --enable) main_owasp - check_lsv - enable_modsec ;; - -disable | -d | -D) - check_lsv + -[dD] | -disable | --disable) disable_modsec ;; *) diff --git a/bin/container/serialctl.sh b/bin/container/serialctl.sh index 8099c97..42e312d 100755 --- a/bin/container/serialctl.sh +++ b/bin/container/serialctl.sh @@ -1,11 +1,20 @@ #!/bin/bash LSDIR='/usr/local/lsws' +EPACE=' ' + +echow(){ + FLAG=${1} + shift + echo -e "\033[1m${EPACE}${FLAG}\033[0m${@}" +} help_message(){ - echo 'Command [-serial|-S] SERIAL' - echo 'Example: serialctl.sh -s SERIAL' - echo 'Example: serialctl.sh -s TRIAL' - exit 0 + echo -e "\033[1mOPTIONS\033[0m" + echow '-S, --serial [YOUR_SERIAL|TRIAL]' + echo "${EPACE}${EPACE}Will apply and register the serial to LSWS." + echow '-H, --help' + echo "${EPACE}${EPACE}Display help and exit." + exit 0 } check_input(){ @@ -64,7 +73,7 @@ while [ ! -z "${1}" ]; do -[hH] | -help | --help) help_message ;; - -[sS] | -serial) shift + -[sS] | -serial | --serial) shift apply_serial "${1}" ;; *) diff --git a/bin/demosite.sh b/bin/demosite.sh index d64f8d7..63c222b 100755 --- a/bin/demosite.sh +++ b/bin/demosite.sh @@ -59,7 +59,7 @@ EOT } app_download(){ - docker-compose exec ${CONT_NAME} su -c "appinstallctl.sh -app ${1} -domain ${2}" + docker-compose exec ${CONT_NAME} su -c "appinstallctl.sh --app ${1} --domain ${2}" } lsws_restart(){ diff --git a/bin/domain.sh b/bin/domain.sh index 3a4b344..41e678b 100755 --- a/bin/domain.sh +++ b/bin/domain.sh @@ -27,7 +27,7 @@ check_input(){ add_domain(){ check_input ${1} - docker-compose exec ${CONT_NAME} su -s /bin/bash lsadm -c "cd /usr/local/lsws/conf && domainctl.sh -add ${1}" + docker-compose exec ${CONT_NAME} su -s /bin/bash lsadm -c "cd /usr/local/lsws/conf && domainctl.sh --add ${1}" if [ ! -d "./sites/${1}" ]; then mkdir -p ./sites/${1}/{html,logs,certs} fi @@ -36,7 +36,7 @@ add_domain(){ del_domain(){ check_input ${1} - docker-compose exec ${CONT_NAME} su -s /bin/bash lsadm -c "cd /usr/local/lsws/conf && domainctl.sh -del ${1}" + docker-compose exec ${CONT_NAME} su -s /bin/bash lsadm -c "cd /usr/local/lsws/conf && domainctl.sh --del ${1}" bash bin/webadmin.sh -r } diff --git a/bin/webadmin.sh b/bin/webadmin.sh index 059a6dc..7e8350a 100755 --- a/bin/webadmin.sh +++ b/bin/webadmin.sh @@ -37,16 +37,16 @@ lsws_restart(){ } apply_serial(){ - docker-compose exec ${CONT_NAME} su -c "serialctl.sh -s ${1}" + docker-compose exec ${CONT_NAME} su -c "serialctl.sh --serial ${1}" lsws_restart } mod_secure(){ if [ "${1}" = 'enable' ] || [ "${1}" = 'Enable' ]; then - docker-compose exec ${CONT_NAME} su -s /bin/bash root -c "owaspctl.sh -enable" + docker-compose exec ${CONT_NAME} su -s /bin/bash root -c "owaspctl.sh --enable" lsws_restart elif [ "${1}" = 'disable' ] || [ "${1}" = 'Disable' ]; then - docker-compose exec ${CONT_NAME} su -s /bin/bash root -c "owaspctl.sh -disable" + docker-compose exec ${CONT_NAME} su -s /bin/bash root -c "owaspctl.sh --disable" lsws_restart else help_message