From 1cc301e85c39a9c02e93fee29446fe780f6e29dc Mon Sep 17 00:00:00 2001 From: mxmehl Date: Fri, 10 Jul 2015 13:10:51 +0300 Subject: [PATCH] outsource variables to config file --- action.sh | 8 -------- config.cfg.sample | 12 ++++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/action.sh b/action.sh index f440ac6..3c4f8cf 100755 --- a/action.sh +++ b/action.sh @@ -33,14 +33,6 @@ ACTION="$1" # adduser, changepw, listusers, userdetail, deluser, sizeall, size USER="$2" PASS="$3" -SYSUSER=$(whoami) -NOTES="$HOME/$SYSUSER-Notes.txt" -NOTESTMP=.Notes.txt.tmp - -MAILTYPE=mailsendenc # Use mailsend for plaintext, mailsendenc for SSL-encrypted details -SSLKEY=ssl.key # Only needed when using mailsendenc -MAILTMP=.mail.txt.tmp - ## FUNCTIONS function checkaction { REGEX="^adduser$|^changepw$|^listusers$|^userdetail$|^deluser$|^sizeall$|^sizeuser$|^viewdata$" diff --git a/config.cfg.sample b/config.cfg.sample index 97d63ab..6a902f5 100644 --- a/config.cfg.sample +++ b/config.cfg.sample @@ -1,4 +1,16 @@ +SYSUSER=$(whoami) + +# Email stuff DOMAIN=panel.domain.tld TOEMAIL=user@domain.tld FREMAIL=user@domain.tld SENDMAILPATH=/usr/sbin/sendmail +MAILTMP=.mail.txt.tmp +MAILTYPE=mailsendenc # Use mailsend for plaintext, mailsendenc for SSL-encrypted details +SSLKEY=ssl.key # Only needed when using mailsendenc + +# Datasheet +NOTES=$HOME/$SYSUSER-Notes.txt +NOTESTMP=.Notes.txt.tmp + +