diff --git a/fabfile.py b/fabfile.py index f17603b..a7a7d06 100644 --- a/fabfile.py +++ b/fabfile.py @@ -17,6 +17,16 @@ def develop(): env.BRANCH = BRANCH_DEVELOP +@task +def stage(): + env.status = 'stage' + env.user = USER_DEVELOP + env.password = PASS_DEVELOP + env.hosts = HOSTS_DEVELOP + env.PROJECT_DIR = f'projects/{PROJECT_NAME_DEVELOP}-stage' + env.BRANCH = BRANCH_PROD + + @task def prod(): env.status = 'prod' @@ -40,6 +50,10 @@ def docker_rebuild(): run('docker-compose build') run('docker-compose down') run('docker-compose up -d') + elif env.status == 'stage': + run('docker-compose -f docker-compose.stage.yml build') + run('docker-compose -f docker-compose.stage.yml down') + run('docker-compose -f docker-compose.stage.yml up -d') else: run('docker-compose -f docker-compose.develop.yml build') run('docker-compose -f docker-compose.develop.yml down') @@ -51,6 +65,8 @@ def docker_restart(): with cd(env.PROJECT_DIR): if env.status == 'prod': run('docker-compose restart web') + elif env.status == 'stage': + run('docker-compose -f docker-compose.stage.yml restart web') else: run('docker-compose -f docker-compose.develop.yml restart web') diff --git a/src/dokumentor/urls.py b/src/dokumentor/urls.py index e9ef30d..fd4f753 100644 --- a/src/dokumentor/urls.py +++ b/src/dokumentor/urls.py @@ -7,6 +7,8 @@ from django.conf.urls.static import static from django.contrib import admin from django.views.generic import RedirectView +from pages.views import robots + admin.autodiscover() autocomplete_light.autodiscover() @@ -30,7 +32,9 @@ urlpatterns = [ url(r'^user/', include('myauth.urls')), url(r'^captcha/', include('captcha.urls')), url(r'^robokassa/', include('robokassa.urls')), + url(r'^robots.txt$', robots), url(r'^', include('cms.urls')), + ] if settings.DEBUG: diff --git a/src/pages/views.py b/src/pages/views.py index fbb3303..7d1a94b 100644 --- a/src/pages/views.py +++ b/src/pages/views.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from django.shortcuts import redirect +from django.shortcuts import redirect, render_to_response from cms.views import details @@ -10,3 +10,7 @@ def site_index(request): return details(request, '') else: return redirect('customer_profile_view') + + +def robots(request): + return render_to_response('robots.txt', content_type="text/plain") diff --git a/templates/robots.txt b/templates/robots.txt new file mode 100644 index 0000000..1347d8e --- /dev/null +++ b/templates/robots.txt @@ -0,0 +1,9 @@ +Host: dokumentor.ru + +User-agent: * +Disallow: /admin/ + +User-agent: YandexBot +Disallow: /admin/ + +Sitemap: https://dokumentor.ru/sitemap.xml