phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop

Browse Source
This commit is contained in:
Dmitriy Kuzmenko 2019-08-28 10:15:29 +03:00
commit 3d7727b4b4
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/main/methods.py
View File

@ -54,7 +54,7 @@ def determine_user_site_url(country_code):
except Exception: except Exception:
return site_url(schema=settings.SCHEMA_URI, return site_url(schema=settings.SCHEMA_URI,
subdomain=settings.DEFAULT_SUBDOMAIN, subdomain=settings.DEFAULT_SUBDOMAIN,
domain=settings.DOMAIN_URI) domain=settings.SITE_DOMAIN_URI)
else: else:
return site.site_url return site.site_url

2
apps/main/models.py
View File

@ -142,7 +142,7 @@ class SiteSettings(ProjectBaseMixin):
def site_url(self): def site_url(self):
return methods.site_url(schema=settings.SCHEMA_URI, return methods.site_url(schema=settings.SCHEMA_URI,
subdomain=self.subdomain, subdomain=self.subdomain,
domain=settings.DOMAIN_URI) domain=settings.SITE_DOMAIN_URI)
class Feature(ProjectBaseMixin): class Feature(ProjectBaseMixin):

1
project/settings/development.py
View File

@ -8,4 +8,5 @@ SMS_CODE_SHOW = True
SCHEMA_URI = 'http' SCHEMA_URI = 'http'
DEFAULT_SUBDOMAIN = 'www' DEFAULT_SUBDOMAIN = 'www'
SITE_DOMAIN_URI = 'id-east.ru'
DOMAIN_URI = 'gm.id-east.ru' DOMAIN_URI = 'gm.id-east.ru'

3
project/settings/local.py
View File

@ -9,7 +9,8 @@ USE_CELERY = False
SCHEMA_URI = 'http' SCHEMA_URI = 'http'
DEFAULT_SUBDOMAIN = 'www' DEFAULT_SUBDOMAIN = 'www'
DOMAIN_URI = 'testserver.com:8000' SITE_DOMAIN_URI = 'testserver.com:8000'
DOMAIN_URI = '0.0.0.0:8000'
# OTHER SETTINGS # OTHER SETTINGS
API_HOST = '0.0.0.0:8000' API_HOST = '0.0.0.0:8000'