Updated setup.py\ssl_fmod and config/ssl

parent 33bef825
[ssl] [ssl]
certificate_dir = /etc/opt/drweb.com/certs cert_dir = /etc/opt/drweb.com/certs
...@@ -10,11 +10,14 @@ from settingsd import shared ...@@ -10,11 +10,14 @@ from settingsd import shared
from settingsd import logger from settingsd import logger
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
##### Private constants #####
SERVICE_NAME = "ssl" SERVICE_NAME = "ssl"
SSL_METHODS_NAMESPACE = "ssl" SSL_METHODS_NAMESPACE = "ssl"
CERTS_DIR = '/etc/opt/drweb.com/certs'
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')
...@@ -29,6 +32,7 @@ CERT_SUBJECT = '/C=RU/ST=1/L=1/O=1/OU=1/CN={}/emailAddress=1' ...@@ -29,6 +32,7 @@ CERT_SUBJECT = '/C=RU/ST=1/L=1/O=1/OU=1/CN={}/emailAddress=1'
##### Private classes ##### ##### Private classes #####
class Ssl(service.FunctionObject) : class Ssl(service.FunctionObject) :
### DBus methods ### ### DBus methods ###
@service.functionMethod(SSL_METHODS_NAMESPACE) @service.functionMethod(SSL_METHODS_NAMESPACE)
def generateCertificate(self): def generateCertificate(self):
......
...@@ -108,6 +108,10 @@ setup( ...@@ -108,6 +108,10 @@ 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 = [
"gudev",
"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