Browse Source

simple refactoring

devel
Dmitry Novikov 6 years ago
parent
commit
e3c95a5c22
  1. 0
      agent/netflow/start_netflow.sh
  2. 0
      dhcp_lever.py
  3. 12
      djing/settings.py
  4. 2
      periodic.py
  5. 2
      templates/custom_pages/footer.htm
  6. 2
      templates/custom_pages/main_page.htm
  7. 4
      templates/custom_pages/service.htm
  8. 2
      templates/custom_pages/service_bottom.htm

0
agent/netflow/start_netflow.sh

0
dhcp_lever.py

12
djing/settings.py

@ -214,13 +214,13 @@ BOOTSTRAP3 = {
# Email config # 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 related settings
REDIS_HOST = 'localhost' REDIS_HOST = 'localhost'

2
periodic.py

@ -1,4 +1,4 @@
#!/usr/bin/env python3
#!/var/www/djing/venv/bin/python
import os import os
from threading import Thread from threading import Thread
import django import django

2
templates/custom_pages/footer.htm

@ -1 +1 @@
Your custom content <i>here</i>.
{# Your custom content <i>here</i>. #}

2
templates/custom_pages/main_page.htm

@ -1 +1 @@
<h1>You can change this page</h1>
{# <h1>You can change this page</h1> #}

4
templates/custom_pages/service.htm

@ -1,2 +1,2 @@
<h1>Your custom content</h1>
<p>You have service variable {{ active_service }}</p>
{# <h1>Your custom content</h1> #}
{# <p>You have service variable {{ active_service }}</p> #}

2
templates/custom_pages/service_bottom.htm

@ -1 +1 @@
<h1>Your custom content on bottom</h1>
{# <h1>Your custom content on bottom</h1> #}
Loading…
Cancel
Save