update db readme email subject and remove old nginx auth. site

This commit is contained in:
creme 2020-02-03 11:06:13 +01:00
parent 5c2ba1964a
commit 5fdc0c0494
Signed by: creme
GPG Key ID: C147C3B7FBDF08D0
2 changed files with 5 additions and 37 deletions

View File

@ -3,7 +3,6 @@
domain='envs.net'
short_dom="$(echo $domain | awk -F. '{printf $1}')"
cmd="$1"
user="$2"
mailTo="$3"
@ -24,7 +23,7 @@ head_def="$head_mime\r\n$head_type"
send_db_mail() {
db_type="$1"
db_sub="Subject: database on envs created"
db_sub="Subject: envs - database readme"
db_mail="$head_def\r\nTo: $user@$domain\r\nFrom: sudoers@$domain\r\n$db_sub"
echo -e "$db_mail\r\n$(sed -e s/_username_/"$user"/g -e s/_password_/"$newpw"/g -e s/_sql_/"$db_type"/g /usr/local/bin/envs.net/database-email.tmpl)" \
@ -96,10 +95,6 @@ add_user() {
chmod 644 /home/"$user"/.ssh/authorized_keys
chown -R "$user":"$short_dom" /home/"$user"/.ssh
# setup database
#add_user_mysql_db
#add_user_pgsql_db
# setup email mailbox
lxc-attach -n mail -- bash -c "/usr/local/bin/coreapi action accounts create \
-p username=$user@$domain -p role=SimpleUsers -p language=en \
@ -133,6 +128,10 @@ add_user() {
chmod go-r /home/"$user"/.muttrc
printf '\n~%s\n' "$user" > /home/"$user"/.mutt/signature
# setup database
#add_user_mysql_db
#add_user_pgsql_db
# setup znc account (only after request..)
#sudo -u znc pkill -SIGUSR1 znc && pkill znc
#sudo -u znc /srv/znc/add_znc_user.sh "$user"

View File

@ -1,31 +0,0 @@
server {
include snippets/listen_local.conf;
include snippets/listen.conf;
# include snippets/ddos_def.conf;
server_name auth.envs.net;
return 307 https://$host$request_uri;
}
server {
include snippets/listen_local_ssl.conf;
include snippets/listen_ssl.conf;
# include snippets/ddos_def.conf;
server_name auth.envs.net;
include snippets/ssl.conf;
include ssl/envs_net_wild.conf;
include snippets/local_ssl_header.conf;
error_log /var/log/nginx/envs.net-error.log;
root /var/www/auth.envs.net/;
location / {
index index.php index.html;
}
location ~ \.php$ {
include snippets/fastcgi-php.conf;
fastcgi_pass unix:/var/run/php/php7.3-fpm.sock;
}
}