Skip to content

Commit b0cc0fa

Browse files
author
Lucio Correia
committed
Adapt Ginger to use Wok - Webserver Originated from Kimchi
- Use WokRoot instead of Root This avoids plugin breaking due to absence of default_page attribute, and also makes Wok models/API available to Ginger. - Do not use kimchi.url anymore This makes analog changes to Ginger as done by Kimchi's commit 61ffb22a8733250dc5792528773939769072713c . - Ginger is not using cachebust's href() - Add ginger-help.css for help pages Since kimchi is now a plugin, kimchi.css is not accessible anymore. Add a copy of it as ginger-help.css. - Install ginger .mo files to default locale dir This is necessary to adapt Ginger to changes done by Kimchi's commit 2e90908b8e79ff293298dfcd83b166dd06d361c3 . - Remove version restriction from wok dependency - Fix tests - Allow Ginger to receive wok server options in constructor This change is necessary to adapt Ginger to changes proposed in kimchi-wok split V2 on kimchi side. - Move kimchi-specific network utilities to ginger The modules network and netinfo are moved from wok to kimchi plugin. Fix it by adding netinfo module and network functions used by Ginger. Signed-off-by: Lucio Correia <[email protected]> Signed-off-by: Gustavo Y. Ribeiro <[email protected]>
1 parent 43b09f5 commit b0cc0fa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+678
-245
lines changed

Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ ginger_PYTHON = \
3333
i18n.py \
3434
$(NULL)
3535

36-
gingerdir = $(pythondir)/kimchi/plugins/ginger
36+
gingerdir = $(pythondir)/wok/plugins/ginger
3737

38-
confdir = $(sysconfdir)/kimchi/plugins.d
38+
confdir = $(sysconfdir)/wok/plugins.d
3939
dist_conf_DATA = ginger.conf
4040

4141
EXTRA_DIST = \

README

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Ginger
22
======
33

4-
Ginger is an open source host management plugin to Kimchi, that provides an
5-
intuitive web panel with common tools for configuring and operating Linux
6-
systems.
4+
Ginger is an open source host management plugin to Wok, Web Server Originated
5+
from Kimchi, that provides an intuitive web panel with common tools for
6+
configuring and operating Linux systems.
77

88
The current features include:
99
+ retreive system health (sensors) stats
@@ -42,9 +42,9 @@ $ semanage permissive -a tuned_t
4242
$ systemctl stop tuned.service
4343
$ tuned -l -P -d
4444

45-
Remember to restart kimchid service after these changes:
45+
Remember to restart wokd service after these changes:
4646

47-
$ systemctl restart kimchid.service
47+
$ systemctl restart wokd.service
4848

4949
If these steps do not solve the problem, try to update all 'tuned' related
5050
packages and the packages'selinux-policy' and 'selinux-policy-targeted'.

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ AM_INIT_AUTOMAKE([-Wno-portability])
3636
AM_PATH_PYTHON([2.6])
3737
AC_PATH_PROG([PEP8], [pep8], [/usr/bin/pep8])
3838
AC_SUBST([PYTHON_VERSION])
39-
AC_PYTHON_MODULE([kimchi])
40-
AC_SUBST([HAVE_PYMOD_KIMCHI])
39+
AC_PYTHON_MODULE([wok])
40+
AC_SUBST([HAVE_PYMOD_WOK])
4141
AM_GNU_GETTEXT([external])
4242
AM_GNU_GETTEXT_VERSION([0.18])
4343
AC_PATH_PROG([CHEETAH], [cheetah], [/usr/bin/cheetah])

contrib/DEBIAN/control.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Version: @PACKAGE_VERSION@
33
Section: base
44
Priority: optional
55
Architecture: all
6-
Depends: kimchi,
6+
Depends: wok,
77
python-libuser
88
Maintainer: Daniel Henrique Barboza <[email protected]>
9-
Description: Ginger plug-in for Kimchi web server
9+
Description: Ginger plug-in for Wok - Webserver Originated from Kimchi

controls/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ controls_PYTHON = \
3131
users.py \
3232
$(NULL)
3333

34-
controlsdir = $(pythondir)/kimchi/plugins/ginger/controls
34+
controlsdir = $(pythondir)/wok/plugins/ginger/controls
3535

3636
CLEANFILES = \
3737
$(controls_PYTHON:%.py=%.pyc) \

controls/backup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import cherrypy
2121
from cherrypy.lib.static import serve_file
2222

23-
from kimchi.control.base import Collection, Resource
23+
from wok.control.base import Collection, Resource
2424

2525

2626
class Backup(Resource):

controls/capabilities.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# License along with this library; if not, write to the Free Software
1818
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1919

20-
from kimchi.control.base import Resource
20+
from wok.control.base import Resource
2121

2222

2323
class Capabilities(Resource):

controls/firmware.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# License along with this library; if not, write to the Free Software
1818
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1919

20-
from kimchi.control.base import Resource
20+
from wok.control.base import Resource
2121

2222

2323
class Firmware(Resource):

controls/ibm_sep.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# License along with this library; if not, write to the Free Software
1818
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1919

20-
from kimchi.control.base import Collection, Resource
20+
from wok.control.base import Collection, Resource
2121

2222

2323
class Sep(Resource):

controls/interfaces.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# License along with this library; if not, write to the Free Software
1818
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1919

20-
from kimchi.control.base import Collection, Resource
20+
from wok.control.base import Collection, Resource
2121

2222

2323
class Interfaces(Collection):

0 commit comments

Comments
 (0)