diff --git a/.env.default b/.env.default index 4807916..adc8e28 100644 --- a/.env.default +++ b/.env.default @@ -4,6 +4,9 @@ OSIT_ENV=development # OSIT_ENV=production # OSIT_ENV=testing +OSIT_WEB_HTTP_PORT=8080 +OSIT_WEB_HTTPS_PORT=4443 + # Aether general shared config options # For general shared config options like API access and use, database access and use, Redis, and SMTP # home development, live testing, live production, onsite development, onsite testing, onsite production??? diff --git a/README.md b/README.md index 92db98d..1bd4961 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ git clone https://scott_idem@bitbucket.org/oneskyit/one-sky-it-container-environ * Copy MariaDB database files to the srv/mariadb/ directory using rsync. The original files may need to be copied from the normal Arch Linux location (/var/lib/mysql) first and then possibly reset the root password. ```bash sudo rsync -vhr -progress /var/lib/mysql/ /srv/env/test_aether/srv/mariadb/ -sudo rsync -vhrz scott@linode.oneskyit.com:/srv/env/test_aether/srv/mariadb/ /srv/mariadb/ +sudo rsync -vhrz scott@linode.oneskyit.com:/srv/env/test_aether/srv/mariadb/ /srv/env/test_aether/srv/mariadb/ +sudo chown -R scott:scott /srv/env/test_aether/srv/mariadb/ ``` ### Part 3 diff --git a/conf/aether_api_config.py b/conf/aether_api_config.py index 53e0299..cac0e06 100644 --- a/conf/aether_api_config.py +++ b/conf/aether_api_config.py @@ -54,7 +54,7 @@ class Settings(BaseSettings): # CORS Origins - ORIGINS_REGEX = '(https://.*\.oneskyit\.com)|(http://.*\.oneskyit\.com)|(http://.*\.oneskyit\.com:8181)|(https://.*\.oneskyit\.com:8443)|(http://.*\.oneskyit\.local)|(http://.*\.oneskyit\.local:5000)|(http://.*.localhost)|(http://.*.localhost:5000)|(http://.*.localhost:8181)' + ORIGINS_REGEX = '(https://.*\.oneskyit\.com)|(http://.*\.oneskyit\.com)|(https://.*\.oneskyit\.com:4443)|(http://.*\.oneskyit\.com:8080)|(http://.*\.oneskyit\.com:8181)|(https://.*\.oneskyit\.com:8443)|(http://.*\.oneskyit\.local)|(http://.*\.oneskyit\.local:5000)|(http://.*.localhost)|(http://.*.localhost:5000)|(http://.*.localhost:8181)' # A reasonable, but fairly open example regular expression for the CORS origins: # '(https://.*\.oneskyit\.com)|(http://.*\.oneskyit\.com)|(http://.*\.oneskyit\.com:8181)|(https://.*\.oneskyit\.com:8443)|(http://.*\.oneskyit\.local)|(http://.*\.oneskyit\.local:5000)|(http://.*.localhost)|(http://.*.localhost:5000)|(http://.*.localhost:8181)' diff --git a/docker-compose.yml b/docker-compose.yml index 54d911d..ea814b4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,8 @@ services: # This does not seem to work (yet???) - AE_DOMAIN_LIST:'dev-aapor.oneskyit.com dev-businessgroup.oneskyt.com dev-cmsc.oneskyit.com dev-idaa.oneskyit.com dev-ishlt.oneskyit.com dev-ncsd.oneskyit.com dev-npa.oneskyit.com dev-rli.oneskyit.com' ports: + - "${OSIT_WEB_HTTP_PORT}:80" + - "${OSIT_WEB_HTTPS_PORT}:443" - "80:80" - "443:443" - "8181:80"