From 7de09037c1f8dc89aa583fb80a40ef2d1f415052 Mon Sep 17 00:00:00 2001 From: Artyom Kravchenko Date: Wed, 31 Mar 2021 10:54:16 +0300 Subject: [PATCH] add env params --- access_controller/settings.py | 16 ++++++++-------- db/zd_db.sqlite3 | Bin 159744 -> 159744 bytes main/apiauth.py | 2 +- main/migrations/0001_initial.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/access_controller/settings.py b/access_controller/settings.py index a534ac9..4b011a7 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -10,7 +10,7 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/3.1/ref/settings/ """ import os -from pathlib import Path + # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -180,18 +180,18 @@ LOGGING = { } ZENDESK_ROLES = { - 'engineer': 360005209000, - 'light_agent': 360005208980, + 'engineer': int(os.getenv('ENG_CROLE_ID')), + 'light_agent': int(os.getenv('LA_CROLE_ID')), } ZENDESK_GROUPS = { - 'employees': 'Поддержка', - 'buffer': 'Сменная группа', + 'employees': os.getenv('EMPL_GROUP'), + 'buffer': os.getenv('BUF_GROUP'), } -SOLVED_TICKETS_EMAIL = 'd.krikov@ngenix.net' +SOLVED_TICKETS_EMAIL = os.getenv('ST_EMAIL') -ZENDESK_MAX_AGENTS = 3 +ZENDESK_MAX_AGENTS = int(os.getenv('LICENSE_NO')) REST_FRAMEWORK = { # Use Django's standard `django.contrib.auth` permissions, @@ -201,4 +201,4 @@ REST_FRAMEWORK = { ] } -ONE_DAY = 12 # Количество часов в 1 рабочем дне +ONE_DAY = int(os.getenv('SHIFTH')) # Количество часов в 1 рабочем дне diff --git a/db/zd_db.sqlite3 b/db/zd_db.sqlite3 index fd85558f9cd588bb1593642bf11560e053a64232..ea41825797eb7325761c831993282ae14e11bf53 100644 GIT binary patch delta 1054 zcmaix%}*0S7>9Q$RjXk~0%}5AiW*{!Y@OYio!PC%WDBKQEVh)c;6-X%3jHpnRC*C4 zo-jr-MvugUi3cyH2M^wjH_@Omh6C|p{1+r9E|A#O#CVy*GxK{to>|&5vqkpQb3$lc%jPv3a>~F&lIBx1ucpa_ z5_Zpd!NMpdDrE1R$ifsAD~NTvh=oZ+lN4sSd@ZJG1StwzcWD+zse}>x=DK8I3V{-2 z*o`d=VS+KMyA=zQ6@nG^+HILdg%nYZ{d8Mqp(<68%KW{SJIR6nI0a>n17~q5fVat5b zCmdQ9`3`RRtj^|2Mvn|-NrXs5QXix~1^Te+rLrbzki9LbY^(U7o#VL2&0;AH`9~|8 z>#sJ~c{p`|2OAvNXm*z00LjZA?qJFCz4&PRV0HrGN7_2f`n>Rk6TX<^Z3uVnp62c0mAGEb%QFRShQM^Pk!n;bbM-XDYO<2d){+Ee ztKM|zwlNC>BlWBv9ZQR``LWn|D%S`WqZ5%pEHOS9D+Y(lAvu(yso{L1L>D4rdhupH zVbmH(DaRwwkPM@en$G7k)72UEayVL@o4AutD|7K$Ii8&#s?=yi&Q<1-JUVeRywK3b z7g2RGb0wI*nyF_9i6)0`j|M`MIn7_jRqW5|p?KXt5=iL*sK)}(D50^S|2nOUs6I3s z@=5tIBU$j}u4ba)k!!<^TS%{mZ_ETl7)VC-NKmXTR^`I<;Pr7MG*KBY(p&nzMl4F$ t@;?faCF$_4H?YNlt!C%a2jD$z3p@VjY(Mjr17FR|XVB}m>5hMQ_yt~{983TJ delta 524 zcmY+Au}i~16vi*wf<>BBsuY@}NrmEIv6tlKa#uxZ^>1))K?jA_P1lMzDWV*>1_i~z zMKU;ach#Xfb?7E;{R0$C6q&1ILL-OL=EdKFrNM3vr>49hz zr5uz+dLYjJF-l{-_u^{ugSt@;Pn1m1#=X!u8<5E~%9rb{?e<@l$&JS&53aZ}7m|8C z=0x>An@fvh8Sl5YEN-DGTtWB~_i+y&;8Xm7E4UGs$Q%wU)i*MY5Sma22=A$buw=ce kV$eBH9p#j4*xBD9%KdRac dict: :return: данные пользователя """ credentials = { - 'subdomain': 'ngenix1612197338' + 'subdomain': os.getenv('ZD_DOMAIN') } email = os.getenv('ACCESS_CONTROLLER_API_EMAIL') token = os.getenv('ACCESS_CONTROLLER_API_TOKEN') diff --git a/main/migrations/0001_initial.py b/main/migrations/0001_initial.py index ab7c944..4773f00 100644 --- a/main/migrations/0001_initial.py +++ b/main/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.6 on 2021-03-30 15:31 +# Generated by Django 3.1.6 on 2021-03-30 22:06 from django.conf import settings from django.db import migrations, models