From bed8dba0821933c410c6b3b9c142288dec856a5b Mon Sep 17 00:00:00 2001 From: Luke Berndt Date: Tue, 9 Jun 2020 22:14:40 -0400 Subject: [PATCH] correcting --- README.md | 3 ++- account/LICENSE | 21 --------------------- admin/LICENSE | 21 --------------------- docker-test.sh | 2 +- frontend/LICENSE | 21 --------------------- 5 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 account/LICENSE delete mode 100644 admin/LICENSE delete mode 100644 frontend/LICENSE diff --git a/README.md b/README.md index 1615fb4..976c274 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Make sure the following is in: */etc/hosts* 127.0.0.1 openmhz.test api.openmhz.test admin.openmhz.test media.openmhz.test ```` -## Default user name: +## Default user name, for Test: - test@test.com - password: password @@ -38,3 +38,4 @@ CNAMEs need to be created for the various services. Create the CNAMEs below with After doing this, you should have the following domains: api.domain.com, account.domain.com, media.domain.com, admin.domain.compose ## Mailjet +Sign up for MailJet! diff --git a/account/LICENSE b/account/LICENSE deleted file mode 100644 index 71f68d5..0000000 --- a/account/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 Frank Kilkelly - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/admin/LICENSE b/admin/LICENSE deleted file mode 100644 index 71f68d5..0000000 --- a/admin/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 Frank Kilkelly - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/docker-test.sh b/docker-test.sh index 6c7e59e..7407925 100755 --- a/docker-test.sh +++ b/docker-test.sh @@ -18,7 +18,7 @@ export ACCOUNT_SERVER="${PROTOCOL}account.${DOMAIN_NAME}" export COOKIE_DOMAIN=".${DOMAIN_NAME}" export SITE_NAME="OpenMHz" export ADMIN_EMAIL="admin@email.com" -export S3_PROFILE='wasabi-account' +export S3_PROFILE='default' export S3_ENPOINT='s3.us-west-1.wasabisys.com' export FREE_PLAN=0 export PRO_PLAN=10 diff --git a/frontend/LICENSE b/frontend/LICENSE deleted file mode 100644 index 71f68d5..0000000 --- a/frontend/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 Frank Kilkelly - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE.