Commit cbaed926 authored by Štěpán Henek's avatar Štěpán Henek 🐻

foris+foris-controller: setting passwords in foris via foris-controller

parent 59ed624a
......@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=foris-controller
PKG_VERSION:=0.8
PKG_VERSION:=0.8.1
PKG_RELEASE:=1
PKG_SOURCE_SUBDIR:=$(PKG_NAME)
PKG_SOURCE_PROTO:=git
......@@ -26,8 +26,8 @@ define Package/foris-controller
TITLE:=foris-controller
URL:=https://gitlab.labs.nic.cz/turris/foris-controller
DEPENDS:=\
+python-light +python-ubus +python-prctl +python-multiprocessing +foris-schema \
+server-uplink
+python-light +python-ubus +python-prctl +python-multiprocessing +python-pbkdf2 \
+foris-schema +server-uplink
MAINTAINER:=Stepan Henek <stepan.henek@nic.cz>
endef
......
diff --git a/foris_controller_backends/cmdline/__init__.py b/foris_controller_backends/cmdline/__init__.py
index 96a41b6..624e65e 100644
--- a/foris_controller_backends/cmdline/__init__.py
+++ b/foris_controller_backends/cmdline/__init__.py
@@ -101,7 +101,7 @@ class BaseCmdLine(object):
if not retval == 0:
logger.error("Command %s failed." % str(args))
raise BackendCommandFailed(retval, args)
- match = re.search(regex, stdout)
+ match = re.search(regex, stdout, re.MULTILINE)
if not match:
logger.error("Failed to parse output of %s." % str(args))
raise FailedToParseCommandOutput(args, stdout)
diff --git a/foris_controller_backends/files/__init__.py b/foris_controller_backends/files/__init__.py
index de3e857..d985d71 100644
--- a/foris_controller_backends/files/__init__.py
+++ b/foris_controller_backends/files/__init__.py
@@ -61,7 +61,7 @@ class BaseFile(object):
:rtype: tuple
"""
content = self._file_content(path)
- match = re.search(regex, content)
+ match = re.search(regex, content, re.MULTILINE)
if not match:
logger.error("Failed to parse content of '%s'." % path)
raise FailedToParseFileContent(path, content)
diff --git a/foris_controller_backends/about/__init__.py b/foris_controller_backends/about/__init__.py
index a7f4cb0..f8c0a1c 100644
--- a/foris_controller_backends/about/__init__.py
+++ b/foris_controller_backends/about/__init__.py
@@ -134,7 +134,8 @@ class SystemInfoFiles(BaseFile):
:returns: os version
:rtype: str
"""
- return self._read_and_parse(SystemInfoFiles.OS_RELEASE_PATH, r'^([0-9]+\.[0-9]+)$', (1, ))
+ return self._read_and_parse(
+ SystemInfoFiles.OS_RELEASE_PATH, r'^([0-9]+(\.[0-9]+)*)$', (1, ))
@readlock(file_lock, logger)
def get_model(self):
......@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=foris
PKG_VERSION:=97.1
PKG_VERSION:=97.2
PKG_RELEASE:=1
PKG_SOURCE_SUBDIR:=$(PKG_NAME)
PKG_SOURCE_PROTO:=git
......@@ -28,7 +28,7 @@ $(call include_mk, python-package.mk)
define Package/foris-common
TITLE:=foris-common
DEPENDS:=\
+python-light +python-bottle +python-bottle-i18n +python-pbkdf2 \
+python-light +python-bottle +python-bottle-i18n \
+python-flup +python-ncclient +python-ubus +nuci +lighttpd +lighttpd-mod-fastcgi \
+lighttpd-mod-redirect +user_notify +foris-ws +l10n_supported \
+sqm-scripts +foris-client +turris-maintain
......
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