From e3c95a5c22c13590424362d12468c268b2e62c9d Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Wed, 23 Oct 2019 23:43:24 +0300 Subject: [PATCH] simple refactoring --- agent/netflow/start_netflow.sh | 0 dhcp_lever.py | 0 djing/settings.py | 12 ++++++------ periodic.py | 2 +- templates/custom_pages/footer.htm | 2 +- templates/custom_pages/main_page.htm | 2 +- templates/custom_pages/service.htm | 4 ++-- templates/custom_pages/service_bottom.htm | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) mode change 100755 => 100644 agent/netflow/start_netflow.sh mode change 100644 => 100755 dhcp_lever.py diff --git a/agent/netflow/start_netflow.sh b/agent/netflow/start_netflow.sh old mode 100755 new mode 100644 diff --git a/dhcp_lever.py b/dhcp_lever.py old mode 100644 new mode 100755 diff --git a/djing/settings.py b/djing/settings.py index a49983f..afce2ad 100644 --- a/djing/settings.py +++ b/djing/settings.py @@ -214,13 +214,13 @@ BOOTSTRAP3 = { # Email config -EMAIL_HOST_USER = local_settings.EMAIL_HOST_USER -EMAIL_HOST = local_settings.EMAIL_HOST -EMAIL_PORT = local_settings.EMAIL_PORT -EMAIL_HOST_PASSWORD = local_settings.EMAIL_HOST_PASSWORD -EMAIL_USE_TLS = getattr(local_settings, 'EMAIL_USE_TLS', True) +#EMAIL_HOST_USER = local_settings.EMAIL_HOST_USER +#EMAIL_HOST = local_settings.EMAIL_HOST +#EMAIL_PORT = local_settings.EMAIL_PORT +#EMAIL_HOST_PASSWORD = local_settings.EMAIL_HOST_PASSWORD +#EMAIL_USE_TLS = getattr(local_settings, 'EMAIL_USE_TLS', True) -SERVER_EMAIL = getattr(local_settings, 'SERVER_EMAIL', EMAIL_HOST_USER) +#SERVER_EMAIL = getattr(local_settings, 'SERVER_EMAIL', EMAIL_HOST_USER) # REDIS related settings REDIS_HOST = 'localhost' diff --git a/periodic.py b/periodic.py index 90e378e..d5e7b9d 100755 --- a/periodic.py +++ b/periodic.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/var/www/djing/venv/bin/python import os from threading import Thread import django diff --git a/templates/custom_pages/footer.htm b/templates/custom_pages/footer.htm index 55ce634..2ee2ea3 100644 --- a/templates/custom_pages/footer.htm +++ b/templates/custom_pages/footer.htm @@ -1 +1 @@ -Your custom content here. \ No newline at end of file +{# Your custom content here. #} diff --git a/templates/custom_pages/main_page.htm b/templates/custom_pages/main_page.htm index 27e1fca..f24dce8 100644 --- a/templates/custom_pages/main_page.htm +++ b/templates/custom_pages/main_page.htm @@ -1 +1 @@ -

You can change this page

\ No newline at end of file +{#

You can change this page

#} diff --git a/templates/custom_pages/service.htm b/templates/custom_pages/service.htm index a987da4..c2f67a8 100644 --- a/templates/custom_pages/service.htm +++ b/templates/custom_pages/service.htm @@ -1,2 +1,2 @@ -

Your custom content

-

You have service variable {{ active_service }}

\ No newline at end of file +{#

Your custom content

#} +{#

You have service variable {{ active_service }}

#} diff --git a/templates/custom_pages/service_bottom.htm b/templates/custom_pages/service_bottom.htm index 89cbb76..21fb88e 100644 --- a/templates/custom_pages/service_bottom.htm +++ b/templates/custom_pages/service_bottom.htm @@ -1 +1 @@ -

Your custom content on bottom

\ No newline at end of file +{#

Your custom content on bottom

#}