public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge and cleanup of PR #564

Browse source 
The namespace filter in campaigns was dropped (i.e. "Work with campaign's namespace"). Instead, we need a universal solution. For instance a namespace slector somewhere in the top-right corner, which should apply to everything (not just campaigns).

Nevertheless, I kept the ...-by-namespace rest endpoints and related functions in models because they will be useful for implementing the universal namespace selection feature.
This commit is contained in:
Tomas Bures 2019-03-27 00:41:18 +01:00
parent dcb7168322
commit 2fe7f82be3
18 changed files with 1104 additions and 1143 deletions
Download patch file Download diff file Expand all files Collapse all files

18
setup/functions
View file

@ -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: "asdf1234"
password: "$mysqlPassword"
redis:
enabled: true
@ -206,7 +206,7 @@ mysql:
password: "$mysqlRoPassword"
EOT
#reinstallModules
reinstallModules
(cd client && npm run build)