This commit is contained in:
Bob Mottram 2015-10-27 19:05:29 +00:00
parent d9e008e635
commit 4be9baabc5
1 changed files with 3 additions and 2 deletions

View File

@ -41,7 +41,8 @@ else
echo "set from='$MY_USERNAME <$MY_USERNAME@$HOSTNAME>'" >> /home/$MY_USERNAME/.muttrc echo "set from='$MY_USERNAME <$MY_USERNAME@$HOSTNAME>'" >> /home/$MY_USERNAME/.muttrc
fi fi
sed -i "s|$USER@|$MY_USERNAME@|g" /home/$MY_USERNAME/.procmailrc USERN='$USER@'
sed -i "s|$USERN|$MY_USERNAME@|g" /home/$MY_USERNAME/.procmailrc
# generate a gpg key # generate a gpg key
echo "Making a GPG key for $MY_USERNAME@$HOSTNAME" echo "Making a GPG key for $MY_USERNAME@$HOSTNAME"
@ -138,7 +139,7 @@ if grep -q "Blog domain" $COMPLETION_FILE; then
if [ ! -d /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users ]; then if [ ! -d /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users ]; then
echo 'Blog users directory not found' echo 'Blog users directory not found'
userdel -r $MY_USERNAME userdel -r $MY_USERNAME
exit 8 exit 8
fi fi
echo ';Password' > /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini echo ';Password' > /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
echo "password = '$NEW_USER_PASSWORD'" >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini echo "password = '$NEW_USER_PASSWORD'" >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini