[PATCH] [Kimchi] Implementing sort for Templates tab
by andreteodoro.work＠gmail.com
From: Andre Teodoro <andreteodoro.work(a)gmail.com>
Andre Teodoro (1):
Implementing sort for Templates tab
ui/css/src/modules/_templates.scss | 37 ++++++++++++++++++++++++++++++++++++-
ui/js/src/kimchi.guest_main.js | 7 +++----
ui/js/src/kimchi.template_main.js | 5 ++++-
ui/pages/tabs/templates.html.tmpl | 21 ++++++++++++++++-----
4 files changed, 59 insertions(+), 11 deletions(-)
--
1.8.3.1
8 years, 10 months
[PATCH] [Kimchi] Implementing sort for Templates tab v2
by sguimaraes943＠gmail.com
From: Samuel Guimarães <sguimaraes943(a)gmail.com>
v2:
- Restored Gallery view;
- Fixed some minor CSS and SCSS issues
- Added "View Gallery" and "View Table" strings to i18n.json.tmpl
- Added compiled CSS file
Andre Teodoro (1):
Implementing sort for Templates tab
ui/css/kimchi.css | 61 ++++++++++++++++++++++++++++++++++++++
ui/css/src/modules/_templates.scss | 49 ++++++++++++++++++++++++++++++
ui/js/src/kimchi.template_main.js | 18 +++++------
ui/pages/i18n.json.tmpl | 2 ++
ui/pages/tabs/templates.html.tmpl | 26 ++++++++++++----
5 files changed, 141 insertions(+), 15 deletions(-)
--
1.8.3.1
8 years, 10 months
[PATCH v4][Wok] Rotate wok logs
by Ramon Medeiros
Use logrotate to compress and keep 10 logs of 10MB
Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com>
---
Changes:
v4:
Add wokd.in file at logrotate, adding the logic to change the logging dir if
it has been changed at wok.conf
v3:
Set log size to 10MB
Use WatchedFileHandler to avoid issues with python logging and logrotate
v2:
Add logrotate as dependency
Fix typo in Copyright
Makefile.am | 2 ++
contrib/DEBIAN/control.in | 1 +
contrib/Makefile.am | 1 +
contrib/wok.spec.fedora.in | 2 ++
contrib/wok.spec.suse.in | 2 ++
contrib/wokd.logrotate.in | 28 ++++++++++++++++++++++++++++
src/wok/config.py.in | 2 ++
src/wok/server.py | 29 ++++++++++++++++++++---------
8 files changed, 58 insertions(+), 9 deletions(-)
create mode 100644 contrib/wokd.logrotate.in
diff --git a/Makefile.am b/Makefile.am
index 278bda1..fb4db2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,6 +140,8 @@ install-data-local:
mkdir -p $(DESTDIR)/etc/wok/
$(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem
touch $(DESTDIR)/etc/nginx/conf.d/wok.conf
+ mkdir -p $(DESTDIR)/etc/logrotate.d/
+ $(INSTALL_DATA) $(top_srcdir)/contrib/wokd.logrotate.in $(DESTDIR)/etc/logrotate.d/wokd.in
uninstall-local:
@if test -f $(systemdsystemunitdir)/wokd.service; then \
diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in
index 1f39ad8..e585080 100644
--- a/contrib/DEBIAN/control.in
+++ b/contrib/DEBIAN/control.in
@@ -14,6 +14,7 @@ Depends: python-cherrypy3 (>= 3.2.0),
python-ldap,
python-psutil (>= 0.6.0),
fonts-font-awesome,
+ logrotate,
texlive-fonts-extra
Build-Depends: xsltproc,
gettext,
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index ed4a006..036ec50 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -29,6 +29,7 @@ EXTRA_DIST = \
wokd-upstart.conf.debian \
wokd-upstart.conf.fedora \
make-deb.sh.in \
+ wokd.logrotate.in \
$(NULL)
make-deb.sh: make-deb.sh.in $(top_builddir)/config.status
diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in
index 34b3ac3..612932d 100644
--- a/contrib/wok.spec.fedora.in
+++ b/contrib/wok.spec.fedora.in
@@ -19,6 +19,7 @@ Requires: python-ldap
Requires: python-psutil >= 0.6.0
Requires: fontawesome-fonts
Requires: open-sans-fonts
+Requires: logrotate
BuildRequires: gettext-devel
BuildRequires: libxslt
BuildRequires: openssl
@@ -116,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/nginx/conf.d/wok.conf.in
%{_sysconfdir}/wok/wok.conf
%{_sysconfdir}/wok/
+%{_sysconfdir}/logrotate.d/wokd.in
%{_mandir}/man8/wokd.8.gz
%if 0%{?with_systemd}
diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in
index 7fa660b..66c474b 100644
--- a/contrib/wok.spec.suse.in
+++ b/contrib/wok.spec.suse.in
@@ -20,6 +20,7 @@ Requires: nginx
Requires: python-psutil >= 0.6.0
Requires: fontawesome-fonts
Requires: google-opensans-fonts
+Requires: logrotate
BuildRequires: gettext-tools
BuildRequires: libxslt-tools
BuildRequires: openssl
@@ -94,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/wok/
%{_sysconfdir}/nginx/conf.d/wok.conf.in
%{_sysconfdir}/nginx/conf.d/wok.conf
+%{_sysconfdir}/logrotate.d/wokd.in
%{_var}/lib/wok/
%{_localstatedir}/log/wok/*
%{_localstatedir}/log/wok/
diff --git a/contrib/wokd.logrotate.in b/contrib/wokd.logrotate.in
new file mode 100644
index 0000000..969167d
--- /dev/null
+++ b/contrib/wokd.logrotate.in
@@ -0,0 +1,28 @@
+#
+# Project Wok
+#
+# Copyright IBM Corp, 2016
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+${log_dir}/*log {
+ daily
+ nomail
+ maxsize 10M
+ rotate 10
+ nomissingok
+ compress
+}
+
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index c6b1db2..e46602d 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -83,6 +83,7 @@ class Paths(object):
self.src_dir = '@wokdir@'
self.plugins_dir = '@wokdir@/plugins'
self.mo_dir = '@prefix@/share/locale'
+ self.logrotate_dir = "@sysconfdir(a)/logrotate.d/"
else:
self.nginx_conf_dir = self.add_prefix('src/nginx')
self.state_dir = self.add_prefix('data')
@@ -91,6 +92,7 @@ class Paths(object):
self.src_dir = self.add_prefix('src/wok')
self.plugins_dir = self.add_prefix('src/wok/plugins')
self.mo_dir = self.add_prefix('mo')
+ self.logrotate_conf = ""
for font in FONT_FILES.keys():
paths = FONTS_PATH[font]
diff --git a/src/wok/server.py b/src/wok/server.py
index c2f6c65..f69d39d 100644
--- a/src/wok/server.py
+++ b/src/wok/server.py
@@ -25,16 +25,17 @@ import logging
import logging.handlers
import os
+from string import Template
from wok import auth
from wok import config
-from wok.config import WokConfig, PluginConfig
+from wok.config import config as configParser
+from wok.config import paths, PluginConfig, WokConfig
from wok.control import sub_nodes
from wok.model import model
from wok.proxy import start_proxy, terminate_proxy
from wok.root import WokRoot
from wok.utils import get_enabled_plugins, import_class
-
LOGGING_LEVEL = {"debug": logging.DEBUG,
"info": logging.INFO,
"warning": logging.WARNING,
@@ -99,24 +100,34 @@ class Server(object):
if dev_env:
cherrypy.log.screen = True
- # Create handler to rotate access log file
- h = logging.handlers.RotatingFileHandler(options.access_log, 'a',
- 10000000, 1000)
+ # Create handler to access log file
+ h = logging.handlers.WatchedFileHandler(options.access_log, 'a', delay=1)
h.setLevel(logLevel)
h.setFormatter(cherrypy._cplogging.logfmt)
# Add access log file to cherrypy configuration
cherrypy.log.access_log.addHandler(h)
- # Create handler to rotate error log file
- h = logging.handlers.RotatingFileHandler(options.error_log, 'a',
- 10000000, 1000)
+ # Create handler to error log file
+ h = logging.handlers.WatchedFileHandler(options.error_log, 'a', delay=1)
h.setLevel(logLevel)
h.setFormatter(cherrypy._cplogging.logfmt)
- # Add rotating log file to cherrypy configuration
+ # Add error log file to cherrypy configuration
cherrypy.log.error_log.addHandler(h)
+ # redefine logrotate configuration according to wok.conf
+ with open(os.path.join(paths.logrotate_dir, "wokd.in")) as template:
+ data = template.read()
+
+ data = Template(data)
+ data = data.safe_substitute(log_dir=configParser.get("logging", "log_dir"))
+
+ # Write file to be used for nginx.
+ config_file = open(os.path.join(paths.logrotate_dir, "wokd"), "w")
+ config_file.write(data)
+ config_file.close()
+
# Handling running mode
if not dev_env:
cherrypy.config.update({'environment': 'production'})
--
2.1.0
8 years, 10 months
[PATCH] [WoK] Fixing loading of plug-ins without 'sub_nodes' - part 2
by dhbarboza82＠gmail.com
From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com>
Further enhances the sub_nodes code by executing its
code block if and only if the sub_nodes var is defined.
Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com>
---
src/wok/server.py | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/wok/server.py b/src/wok/server.py
index c2f6c65..6afa74a 100644
--- a/src/wok/server.py
+++ b/src/wok/server.py
@@ -172,20 +172,21 @@ class Server(object):
try:
sub_nodes = import_class('plugins.%s.control.sub_nodes' %
plugin_name)
+
+ urlSubNodes = {}
+ for ident, node in sub_nodes.items():
+ if node.url_auth:
+ ident = "/%s" % ident
+ urlSubNodes[ident] = {'tools.wokauth.on': True}
+
+ plugin_config.update(urlSubNodes)
+
except ImportError, e:
cherrypy.log.error_log.error(
"Failed to import subnodes for plugin %s, "
"error: %s" % (plugin_class, e.message)
)
- urlSubNodes = {}
- for ident, node in sub_nodes.items():
- if node.url_auth:
- ident = "/%s" % ident
- urlSubNodes[ident] = {'tools.wokauth.on': True}
-
- plugin_config.update(urlSubNodes)
-
cherrypy.tree.mount(plugin_app, script_name, plugin_config)
def start(self):
--
2.5.0
8 years, 10 months
[PATCH v3][Wok] Rotate wok logs
by Ramon Medeiros
Use logrotate to compress and keep 10 logs of 10MB
Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com>
---
Changes:
v3:
Set log size to 10MB
Use WatchedFileHandler to avoid issues with python logging and logrotate
v2:
Add logrotate as dependency
Fix typo in Copyright
Makefile.am | 2 ++
contrib/DEBIAN/control.in | 1 +
contrib/Makefile.am | 1 +
contrib/wok.spec.fedora.in | 2 ++
contrib/wok.spec.suse.in | 2 ++
contrib/wokd.logrotate | 28 ++++++++++++++++++++++++++++
src/wok/server.py | 6 ++----
7 files changed, 38 insertions(+), 4 deletions(-)
create mode 100644 contrib/wokd.logrotate
diff --git a/Makefile.am b/Makefile.am
index 278bda1..6d4c574 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,6 +140,8 @@ install-data-local:
mkdir -p $(DESTDIR)/etc/wok/
$(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem
touch $(DESTDIR)/etc/nginx/conf.d/wok.conf
+ mkdir -p $(DESTDIR)/etc/logrotate.d/
+ $(INSTALL_DATA) $(top_srcdir)/contrib/wokd.logrotate $(DESTDIR)/etc/logrotate.d/wokd
uninstall-local:
@if test -f $(systemdsystemunitdir)/wokd.service; then \
diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in
index 1f39ad8..e585080 100644
--- a/contrib/DEBIAN/control.in
+++ b/contrib/DEBIAN/control.in
@@ -14,6 +14,7 @@ Depends: python-cherrypy3 (>= 3.2.0),
python-ldap,
python-psutil (>= 0.6.0),
fonts-font-awesome,
+ logrotate,
texlive-fonts-extra
Build-Depends: xsltproc,
gettext,
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index ed4a006..2939bc9 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -29,6 +29,7 @@ EXTRA_DIST = \
wokd-upstart.conf.debian \
wokd-upstart.conf.fedora \
make-deb.sh.in \
+ wokd.logrotate \
$(NULL)
make-deb.sh: make-deb.sh.in $(top_builddir)/config.status
diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in
index 34b3ac3..5501a20 100644
--- a/contrib/wok.spec.fedora.in
+++ b/contrib/wok.spec.fedora.in
@@ -19,6 +19,7 @@ Requires: python-ldap
Requires: python-psutil >= 0.6.0
Requires: fontawesome-fonts
Requires: open-sans-fonts
+Requires: logrotate
BuildRequires: gettext-devel
BuildRequires: libxslt
BuildRequires: openssl
@@ -116,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/nginx/conf.d/wok.conf.in
%{_sysconfdir}/wok/wok.conf
%{_sysconfdir}/wok/
+%{_sysconfdir}/logrotate.d/wokd
%{_mandir}/man8/wokd.8.gz
%if 0%{?with_systemd}
diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in
index 7fa660b..9e6b7f2 100644
--- a/contrib/wok.spec.suse.in
+++ b/contrib/wok.spec.suse.in
@@ -20,6 +20,7 @@ Requires: nginx
Requires: python-psutil >= 0.6.0
Requires: fontawesome-fonts
Requires: google-opensans-fonts
+Requires: logrotate
BuildRequires: gettext-tools
BuildRequires: libxslt-tools
BuildRequires: openssl
@@ -94,6 +95,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/wok/
%{_sysconfdir}/nginx/conf.d/wok.conf.in
%{_sysconfdir}/nginx/conf.d/wok.conf
+%{_sysconfdir}/logrotate.d/wokd
%{_var}/lib/wok/
%{_localstatedir}/log/wok/*
%{_localstatedir}/log/wok/
diff --git a/contrib/wokd.logrotate b/contrib/wokd.logrotate
new file mode 100644
index 0000000..ded906f
--- /dev/null
+++ b/contrib/wokd.logrotate
@@ -0,0 +1,28 @@
+#
+# Project Wok
+#
+# Copyright IBM Corp, 2016
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+/var/log/wok/*log {
+ daily
+ nomail
+ maxsize 10M
+ rotate 10
+ nomissingok
+ compress
+}
+
diff --git a/src/wok/server.py b/src/wok/server.py
index 4fd380c..31e3c82 100644
--- a/src/wok/server.py
+++ b/src/wok/server.py
@@ -100,8 +100,7 @@ class Server(object):
cherrypy.log.screen = True
# Create handler to rotate access log file
- h = logging.handlers.RotatingFileHandler(options.access_log, 'a',
- 10000000, 1000)
+ h = logging.handlers.WatchedFileHandler(options.access_log, 'a', delay=1)
h.setLevel(logLevel)
h.setFormatter(cherrypy._cplogging.logfmt)
@@ -109,8 +108,7 @@ class Server(object):
cherrypy.log.access_log.addHandler(h)
# Create handler to rotate error log file
- h = logging.handlers.RotatingFileHandler(options.error_log, 'a',
- 10000000, 1000)
+ h = logging.handlers.WatchedFileHandler(options.error_log, 'a', delay=1)
h.setLevel(logLevel)
h.setFormatter(cherrypy._cplogging.logfmt)
--
2.1.0
8 years, 10 months
[PATCH v2] [WoK] ** PLEASE APPLY ASAP ** WoK unable to load Ginger
by dhbarboza82＠gmail.com
From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com>
v2:
- fixing the real error instead of putting an 'if' for Ginger
Recent WoK changes broke Ginger loading:
Failed to import subnodes for plugin plugins.ginger.Ginger, error: Class plugins.ginger.control.sub_nodes can not be imported, error: No module named control
This patch fixes it.
Daniel Henrique Barboza (1):
Fixing loading of plug-ins without 'sub_nodes'
src/wok/server.py | 1 -
1 file changed, 1 deletion(-)
--
2.5.0
8 years, 10 months
[PATCH] [WoK] ** PLEASE APPLY ASAP ** WoK unable to load Ginger
by dhbarboza82＠gmail.com
From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com>
Recent WoK changes broke Ginger loading:
Failed to import subnodes for plugin plugins.ginger.Ginger, error: Class plugins.ginger.control.sub_nodes can not be imported, error: No module named control
This patch fixes it.
Daniel Henrique Barboza (1):
Fixing loading of the 'Ginger' plug-in
src/wok/server.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
--
2.5.0
8 years, 10 months
[Wok] Rotate wok logs
by Ramon Medeiros
Use logrotate to compress and keep 10 logs of 1MB
Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com>
---
Makefile.am | 2 ++
contrib/Makefile.am | 1 +
contrib/wok.spec.fedora.in | 1 +
contrib/wok.spec.suse.in | 1 +
contrib/wokd.logrotate | 30 ++++++++++++++++++++++++++++++
5 files changed, 35 insertions(+)
create mode 100644 contrib/wokd.logrotate
diff --git a/Makefile.am b/Makefile.am
index 278bda1..6d4c574 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,6 +140,8 @@ install-data-local:
mkdir -p $(DESTDIR)/etc/wok/
$(INSTALL_DATA) src/dhparams.pem $(DESTDIR)/etc/wok/dhparams.pem
touch $(DESTDIR)/etc/nginx/conf.d/wok.conf
+ mkdir -p $(DESTDIR)/etc/logrotate.d/
+ $(INSTALL_DATA) $(top_srcdir)/contrib/wokd.logrotate $(DESTDIR)/etc/logrotate.d/wokd
uninstall-local:
@if test -f $(systemdsystemunitdir)/wokd.service; then \
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index ed4a006..2939bc9 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -29,6 +29,7 @@ EXTRA_DIST = \
wokd-upstart.conf.debian \
wokd-upstart.conf.fedora \
make-deb.sh.in \
+ wokd.logrotate \
$(NULL)
make-deb.sh: make-deb.sh.in $(top_builddir)/config.status
diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in
index 34b3ac3..feea7f1 100644
--- a/contrib/wok.spec.fedora.in
+++ b/contrib/wok.spec.fedora.in
@@ -116,6 +116,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/nginx/conf.d/wok.conf.in
%{_sysconfdir}/wok/wok.conf
%{_sysconfdir}/wok/
+%{_sysconfdir}/logrotate.d/wokd
%{_mandir}/man8/wokd.8.gz
%if 0%{?with_systemd}
diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in
index aab4a80..fa477e1 100644
--- a/contrib/wok.spec.suse.in
+++ b/contrib/wok.spec.suse.in
@@ -93,6 +93,7 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/wok/
%{_sysconfdir}/nginx/conf.d/wok.conf.in
%{_sysconfdir}/nginx/conf.d/wok.conf
+%{_sysconfdir}/logrotate.d/wokd
%{_var}/lib/wok/
%{_localstatedir}/log/wok/*
%{_localstatedir}/log/wok/
diff --git a/contrib/wokd.logrotate b/contrib/wokd.logrotate
new file mode 100644
index 0000000..2a03106
--- /dev/null
+++ b/contrib/wokd.logrotate
@@ -0,0 +1,30 @@
+#
+# Project Wok
+#
+# Copyright IBM Corp, 2016
+#
+# Code derived from Project Kimchi
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+/var/log/wok/*log {
+ daily
+ maxsize 1024k
+ rotate 10
+ missingok
+ compress
+ sharedscripts
+}
+
--
2.1.0
8 years, 10 months
[PATCH] [Kimchi 0/4] Upade Kimchi configuration
by Aline Manera
This patch set depends on Wok patch:
- "[Kimchi-devel] [PATCH] [Wok 0/3] Remove Kimchi options from wok and improve how plugins are loaded"
Aline Manera (4):
Update Kimchi configuration according to recent changes on Wok
Remove authentication method information from Kimchi
Use the cached values for wok config when required
Add federation and create_iso_pool options to Kimchi configuration
file
__init__.py | 6 +-
config.py.in | 11 +++-
docs/API.md | 3 +-
docs/README-federation.md | 4 +-
kimchi.conf | 13 ++++-
model/config.py | 14 ++---
model/peers.py | 14 +++--
model/storagepools.py | 8 +--
root.py | 6 +-
tests/test_config.py.in | 10 ++--
tests/test_rest.py | 6 +-
ui/js/src/kimchi.api.js | 106 ++++++++++++++++++------------------
ui/js/src/kimchi.guest_edit_main.js | 6 +-
ui/js/src/kimchi.main.js | 16 ++++--
ui/pages/i18n.json.tmpl | 3 +-
15 files changed, 126 insertions(+), 100 deletions(-)
--
2.5.0
8 years, 10 months
[PATCH] [Wok 0/3] Remove Kimchi options from wok and improve how plugins are loaded
by Aline Manera
Aline Manera (3):
Remove federation and create_iso_pool options from Wok server
Get root application name from plugin name and automatically import
plugin sub_nodes
Update /config API to return the authentication method
docs/API/config.md | 1 +
docs/wokd.8.in | 57 -------------------------------------------------
src/wok.conf.in | 7 ------
src/wok/config.py.in | 2 --
src/wok/model/config.py | 11 ++++------
src/wok/server.py | 37 +++++++++++++++-----------------
src/wokd.in | 10 +--------
tests/test_api.py | 2 +-
ui/js/src/wok.api.js | 17 +++++++++++++--
ui/js/src/wok.main.js | 9 +++++++-
10 files changed, 47 insertions(+), 106 deletions(-)
--
2.5.0
8 years, 10 months
