Commit 88998966 by Őry Máté

django: proper settings import

parent f134e240
from django.contrib import auth
from firewall import models
import os
from cloud.settings import firewall_settings as settings
from django.conf.settings import firewall_settings as settings
import subprocess
import re
......
......@@ -7,7 +7,7 @@ from django.utils.translation import ugettext_lazy as _
from firewall.fields import *
from south.modelsinspector import add_introspection_rules
from django.core.validators import MinValueValidator, MaxValueValidator
from cloud.settings import firewall_settings as settings
from django.conf.settings import firewall_settings as settings
from django.db.models.signals import post_save
import re
import random
......
......@@ -4,7 +4,7 @@ from django.core.cache import cache
import os
import time
from firewall.fw import *
from cloud.settings import firewall_settings as settings
from django.conf.settings import firewall_settings as settings
@celery.task
def reload_dns_task(data):
......
......@@ -18,7 +18,7 @@ from firewall.models import Host, Rule, Vlan, Record
from school.models import Person, Group
from store.api import StoreApi
from .util import keygen
from cloud.settings import CLOUD_URL
from django.conf.settings import CLOUD_URL
logger = logging.getLogger(__name__)
pwgen = User.objects.make_random_password
......
......@@ -20,7 +20,7 @@ from django.utils.translation import ugettext_lazy as _
from django.views.decorators.http import *
from django.views.generic import *
from firewall.tasks import *
from cloud.settings import store_settings
from django.conf.settings import store_settings
from one.models import *
from school.models import *
import django.contrib.auth as auth
......
from django.db import models
from django.http import Http404
import json, requests, time
from cloud.settings import store_settings as settings
from django.conf.settings import store_settings as settings
# Create your models here.
#TODO Handle exceptions locally
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment