Merge branch 'pull/564' into development
This commit is contained in:
commit
dcb7168322
24 changed files with 1216 additions and 52 deletions
|
@ -46,9 +46,9 @@ EOF
|
|||
exit 1
|
||||
fi
|
||||
|
||||
installPrerequisities
|
||||
#installPrerequisities
|
||||
installMailtrain http://localhost:3000 http://localhost:3003 http://localhost:3004 0.0.0.0 false
|
||||
installService
|
||||
#installService
|
||||
|
||||
echo
|
||||
echo "Success!"
|
||||
|
@ -155,11 +155,11 @@ function installMailtrain {
|
|||
mysqlRoPassword=`pwgen 12 -1`
|
||||
|
||||
# Setup MySQL user for Mailtrain
|
||||
mysql -u root -e "CREATE USER 'mailtrain'@'localhost' IDENTIFIED BY '$mysqlPassword';"
|
||||
mysql -u root -e "GRANT ALL PRIVILEGES ON mailtrain.* TO 'mailtrain'@'localhost';"
|
||||
mysql -u root -e "CREATE USER 'mailtrain_ro'@'localhost' IDENTIFIED BY '$mysqlRoPassword';"
|
||||
mysql -u root -e "GRANT SELECT ON mailtrain.* TO 'mailtrain_ro'@'localhost';"
|
||||
mysql -u mailtrain --password="$mysqlPassword" -e "CREATE database mailtrain;"
|
||||
#mysql -u root -e "CREATE USER 'mailtrain'@'localhost' IDENTIFIED BY '$mysqlPassword';"
|
||||
#mysql -u root -e "GRANT ALL PRIVILEGES ON mailtrain.* TO 'mailtrain'@'localhost';"
|
||||
#mysql -u root -e "CREATE USER 'mailtrain_ro'@'localhost' IDENTIFIED BY '$mysqlRoPassword';"
|
||||
#mysql -u root -e "GRANT SELECT ON mailtrain.* TO 'mailtrain_ro'@'localhost';"
|
||||
#mysql -u mailtrain --password="$mysqlPassword" -e "CREATE database mailtrain;"
|
||||
|
||||
# Add new user for the mailtrain daemon to run as
|
||||
useradd mailtrain || true
|
||||
|
@ -181,7 +181,7 @@ www:
|
|||
|
||||
|
||||
mysql:
|
||||
password: "$mysqlPassword"
|
||||
password: "asdf1234"
|
||||
|
||||
redis:
|
||||
enabled: true
|
||||
|
@ -206,7 +206,7 @@ mysql:
|
|||
password: "$mysqlRoPassword"
|
||||
EOT
|
||||
|
||||
reinstallModules
|
||||
#reinstallModules
|
||||
|
||||
(cd client && npm run build)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue