Commit 545e1d09 authored by Никита Ефремов's avatar Никита Ефремов Committed by Никита Ефремов

Reverted deletion of important imports

parent d6264495
...@@ -9,6 +9,7 @@ import abc ...@@ -9,6 +9,7 @@ import abc
from . import config from . import config
from . import tools from . import tools
from .service_decorators import *
##### Private classes ##### ##### Private classes #####
......
...@@ -3,5 +3,4 @@ ...@@ -3,5 +3,4 @@
__all__ = ["common", "network", "os"] __all__ = ["common", "network", "os"]
from .common import ValidatorError
...@@ -4,17 +4,15 @@ import socket ...@@ -4,17 +4,15 @@ import socket
from settingsd import const from settingsd import const
from settingsd import service from settingsd import service
from settingsd import config
from settingsd import shared from settingsd import shared
from settingsd.tools.process import execProcess, SubprocessFailure from settingsd.tools.process import execProcess, SubprocessFailure
from os import path from os import path
from configparser import ConfigParser as Cfp
SERVICE_NAME = "ssl" SERVICE_NAME = "ssl"
SSL_METHODS_NAMESPACE = "ssl" SSL_METHODS_NAMESPACE = "ssl"
CERTS_DIR = config.value(SERVICE_NAME, "cert_dir")
cfg_parser = Cfp()
cfg_parser.read(const.CONFIGS_DIR + "/ssl" + const.CONFIG_FILE_POSTFIX)
CERTS_DIR = cfg_parser.get("ssl", "sert_dir")
CERT_NAME = 'serv' CERT_NAME = 'serv'
PEMFILE = path.join(CERTS_DIR, CERT_NAME + '.pem') PEMFILE = path.join(CERTS_DIR, CERT_NAME + '.pem')
KEYFILE = path.join(CERTS_DIR, CERT_NAME + '.key') KEYFILE = path.join(CERTS_DIR, CERT_NAME + '.key')
......
...@@ -9,6 +9,7 @@ import abc ...@@ -9,6 +9,7 @@ import abc
from . import config from . import config
from . import tools from . import tools
from .service_decorators import *
##### Private classes ##### ##### Private classes #####
......
...@@ -3,5 +3,4 @@ ...@@ -3,5 +3,4 @@
__all__ = ["common", "network", "os"] __all__ = ["common", "network", "os"]
from .common import ValidatorError
#!/usr/bin/env python #!/usr/bimin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
...@@ -15,7 +15,7 @@ from settingsd import const ...@@ -15,7 +15,7 @@ from settingsd import const
##### Private constants ##### ##### Private constants #####
packages_list = ["settingsd", "settingsd/tools", "settingsd/validators"] packages_list = ["settingsd", "settingsd/tools", "settingsd/validators"]
scripts_list = ["settingsd-server.py"] scripts_list = ["settingsd-server.py"]
install_requires = ['file_read_backwards']
##### #####
data_files_list = [ data_files_list = [
...@@ -108,10 +108,9 @@ setup( ...@@ -108,10 +108,9 @@ setup(
packages = packages_list, packages = packages_list,
scripts = scripts_list, scripts = scripts_list,
data_files = data_files_list, data_files = data_files_list,
install_requires = [ requires = [
"gudev",
"file_read_backwards" "file_read_backwards"
] ],
cmdclass = { "install" : SettingsdInstall }, cmdclass = { "install" : SettingsdInstall },
......
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 to comment