[PATCH V2] [Kimchi] Issue #1063: Upon migrating guest to remote server, password less ssh is permanent
by archus＠linux.vnet.ibm.com
From: Archana Singh <archus(a)linux.vnet.ibm.com>
Changes to ensure that password less login is removed if its setup by kimchi.
It also provide option for user to specify if user want to keep
the password less login setup by kimchi, if not specified password
less login setup by kimchi will be removed.
However if password less login is not setup by kimchi,
code does not remove the password less login.
Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com>
---
docs/API.md | 2 +
model/vms.py | 180 ++++++++++++++++++++++++++++++++++++++++++-----------------
2 files changed, 131 insertions(+), 51 deletions(-)
diff --git a/docs/API.md b/docs/API.md
index b29108d..7952984 100644
--- a/docs/API.md
+++ b/docs/API.md
@@ -219,6 +219,8 @@ mode without block migration.
* remote_host: IP address or hostname of the remote server.
* user *(optional)*: User to log on at the remote server.
* password *(optional)*: password of the user in the remote server.
+ * remove_passless_login *(optional)*: If not provided, default is True that means
+ it removes password less setup made by Kimchi.
### Sub-resource: Virtual Machine Screenshot
diff --git a/model/vms.py b/model/vms.py
index d703c89..2dcf507 100644
--- a/model/vms.py
+++ b/model/vms.py
@@ -1797,58 +1797,59 @@ class VMModel(object):
if password is None:
raise OperationFailed("KCHVM0056E",
{'host': remote_host, 'user': user})
- else:
- self._set_password_less_login(remote_host, user, password)
+ return False
+ return True
- def _set_password_less_login(self, remote_host, user, passwd):
- home_dir = '/root' if user is 'root' else '/home/%s' % user
+ def _read_id_rsa_pub_file(self, id_rsa_pub_file):
+ data = None
+ with open(id_rsa_pub_file, "r") as id_file:
+ data = id_file.read()
+ return data
- id_rsa_file = "%s/.ssh/id_rsa" % home_dir
- id_rsa_pub_file = id_rsa_file + '.pub'
- ssh_port = 22
- ssh_client = None
+ def _create_root_ssh_key_if_required(self, user, id_rsa_pub_file,
+ id_rsa_file):
+ if os.path.isfile(id_rsa_pub_file):
+ return
- def read_id_rsa_pub_file():
- data = None
- with open(id_rsa_pub_file, "r") as id_file:
- data = id_file.read()
- return data
+ with open("/dev/zero") as zero_input:
+ cmd = ['ssh-keygen', '-q', '-N', '', '-f', id_rsa_file]
+ proc = subprocess.Popen(
+ cmd,
+ stdin=zero_input,
+ stdout=open(os.devnull, 'wb')
+ )
+ out, err = proc.communicate()
- def create_root_ssh_key_if_required():
- if os.path.isfile(id_rsa_pub_file):
- return
+ if not os.path.isfile(id_rsa_pub_file):
+ raise OperationFailed("KCHVM0070E")
- with open("/dev/zero") as zero_input:
- cmd = ['ssh-keygen', '-q', '-N', '', '-f', id_rsa_file]
- proc = subprocess.Popen(
- cmd,
- stdin=zero_input,
- stdout=open(os.devnull, 'wb')
+ if user != 'root':
+ id_rsa_content = self._read_id_rsa_pub_file(id_rsa_pub_file)
+ updated_content = id_rsa_content.replace(
+ ' root@', ' %s@' % user
)
- out, err = proc.communicate()
+ with open(id_rsa_pub_file, 'w+') as f:
+ f.write(updated_content)
- if not os.path.isfile(id_rsa_pub_file):
- raise OperationFailed("KCHVM0070E")
+ user_uid = pwd.getpwnam(user).pw_uid
+ user_gid = pwd.getpwnam(user).pw_gid
+ os.chown(id_rsa_pub_file, user_uid, user_gid)
+ os.chown(id_rsa_file, user_uid, user_gid)
- if user is not 'root':
- id_rsa_content = read_id_rsa_pub_file()
- updated_content = id_rsa_content.replace(
- ' root@', ' %s@' % user
- )
- with open(id_rsa_pub_file, 'w+') as f:
- f.write(updated_content)
+ def _get_ssh_client(self, remote_host, user, passwd, ssh_port):
+ ssh_client = paramiko.SSHClient()
+ ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+ ssh_client.connect(remote_host, ssh_port, username=user,
+ password=passwd, timeout=4)
+ return ssh_client
- user_uid = pwd.getpwnam(user).pw_uid
- user_gid = pwd.getpwnam(user).pw_gid
- os.chown(id_rsa_pub_file, user_uid, user_gid)
- os.chown(id_rsa_file, user_uid, user_gid)
+ def _set_password_less_login(self, remote_host, user, passwd):
+ home_dir = '/root' if user == 'root' else '/home/%s' % user
- def get_ssh_client(remote_host, user, passwd):
- ssh_client = paramiko.SSHClient()
- ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
- ssh_client.connect(remote_host, ssh_port, username=user,
- password=passwd, timeout=4)
- return ssh_client
+ id_rsa_file = "%s/.ssh/id_rsa" % home_dir
+ id_rsa_pub_file = id_rsa_file + '.pub'
+ ssh_port = 22
+ ssh_client = None
def append_id_rsa_to_remote_authorized_keys(ssh_client, id_rsa_data):
sftp_client = ssh_client.open_sftp()
@@ -1874,9 +1875,11 @@ class VMModel(object):
sftp_client.close()
try:
- create_root_ssh_key_if_required()
- id_rsa_data = read_id_rsa_pub_file()
- ssh_client = get_ssh_client(remote_host, user, passwd)
+ self._create_root_ssh_key_if_required(user, id_rsa_pub_file,
+ id_rsa_file)
+ id_rsa_data = self._read_id_rsa_pub_file(id_rsa_pub_file)
+ ssh_client = self._get_ssh_client(remote_host, user, passwd,
+ ssh_port)
append_id_rsa_to_remote_authorized_keys(
ssh_client,
id_rsa_data
@@ -1915,17 +1918,21 @@ class VMModel(object):
def migration_pre_check(self, remote_host, user, password):
self._check_if_host_not_localhost(remote_host)
- self._check_if_password_less_login_enabled(
+ default_passless_status = self._check_if_password_less_login_enabled(
remote_host,
user,
password
)
- self._check_remote_libvirt_conn(remote_host, user)
+ if not default_passless_status:
+ self._set_password_less_login(remote_host, user, password)
+
self._check_if_migrating_same_arch_hypervisor(remote_host, user)
if platform.machine() in ['ppc64', 'ppc64le']:
self._check_ppc64_subcores_per_core(remote_host, user)
+ return default_passless_status
+
def _check_if_path_exists_in_remote_host(self, path, remote_host, user):
username_host = "%s@%s" % (user, remote_host)
cmd = ['ssh', '-oStrictHostKeyChecking=no', username_host,
@@ -2007,15 +2014,22 @@ class VMModel(object):
user
)
- def migrate(self, name, remote_host, user=None, password=None):
+ def migrate(self, name, remote_host, user=None, password=None,
+ remove_passless_login=True):
name = name.decode('utf-8')
remote_host = remote_host.decode('utf-8')
if user is None:
user = 'root'
+ user = user.encode('utf-8')
+
+ default_passless_status = self.migration_pre_check(remote_host, user,
+ password)
- self.migration_pre_check(remote_host, user, password)
- dest_conn = self._get_remote_libvirt_conn(remote_host, user)
+ if default_passless_status:
+ remove_passless_login = False
+
+ dest_conn = self._get_remote_libvirt_conn(remote_host)
non_shared = self._check_if_nonshared_migration(
name,
@@ -2027,18 +2041,80 @@ class VMModel(object):
'dest_conn': dest_conn,
'non_shared': non_shared,
'remote_host': remote_host,
- 'user': user}
+ 'user': user,
+ 'password': password,
+ 'remove_passless_login': remove_passless_login}
task_id = AsyncTask('/plugins/kimchi/vms/%s/migrate' % name,
self._migrate_task, params).id
return self.task.lookup(task_id)
+ def _remove_password_less_login(self, remote_host, user, passwd):
+ home_dir = '/root' if user == 'root' else '/home/%s' % user
+
+ id_rsa_file = "%s/.ssh/id_rsa" % home_dir
+ id_rsa_pub_file = id_rsa_file + '.pub'
+ ssh_port = 22
+ ssh_client = None
+
+ def remove_id_rsa_to_remote_authorized_keys(ssh_client, id_rsa_data):
+ sftp_client = ssh_client.open_sftp()
+ ssh_dir = '%s/.ssh' % home_dir
+
+ try:
+ sftp_client.chdir(ssh_dir)
+ except IOError:
+ raise OperationFailed(
+ "KCHVM0089E",
+ {'host': remote_host, 'user': user, 'sshdir': ssh_dir}
+ )
+ file_handler = sftp_client.file(
+ '%s/.ssh/authorized_keys' % home_dir,
+ mode='r',
+ bufsize=1
+ )
+ lines = file_handler.readlines()
+ try:
+ lines.remove(id_rsa_data)
+ except ValueError:
+ pass
+ file_handler = sftp_client.file(
+ '%s/.ssh/authorized_keys' % home_dir,
+ mode='w',
+ bufsize=1
+ )
+ file_handler.writelines(lines)
+ file_handler.flush()
+ file_handler.close()
+ sftp_client.close()
+
+ try:
+ self._create_root_ssh_key_if_required(user, id_rsa_pub_file,
+ id_rsa_file)
+ id_rsa_data = self._read_id_rsa_pub_file(id_rsa_pub_file)
+ ssh_client = self._get_ssh_client(remote_host, user, passwd,
+ ssh_port)
+ remove_id_rsa_to_remote_authorized_keys(
+ ssh_client,
+ id_rsa_data
+ )
+ except Exception, e:
+ raise OperationFailed(
+ "KCHVM0068E",
+ {'host': remote_host, 'user': user, 'error': e}
+ )
+ finally:
+ if ssh_client:
+ ssh_client.close()
+
def _migrate_task(self, cb, params):
name = params['name'].decode('utf-8')
dest_conn = params['dest_conn']
non_shared = params['non_shared']
remote_host = params['remote_host']
user = params['user']
+ password = params['password']
+ remove_passless_login = params['remove_passless_login']
cb('starting a migration')
@@ -2072,6 +2148,8 @@ class VMModel(object):
raise OperationFailed('KCHVM0058E', {'err': e.message,
'name': name})
finally:
+ if remove_passless_login:
+ self._remove_password_less_login(remote_host, user, password)
dest_conn.close()
cb('Migrate finished', True)
--
2.7.4
7 years, 4 months
[PATCH] [Kimchi] Fix checking for libvirt daemon on Ubuntu
by Lucio Correia
Starting with Ubuntu 16.10, it also comes with libvirtd and
differentiate it from other distros is not necessary anymore.
It also fixes an issue on libvirt service status verification
causing failure on Kimchi plugin loading:
dev@u1610:$ systemctl is-active libvirt-bin.service
inactive
dev@u1610:$ systemctl is-active libvirtd.service
active
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
utils.py | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/utils.py b/utils.py
index 26d3cf6..1e2c951 100644
--- a/utils.py
+++ b/utils.py
@@ -20,7 +20,6 @@
import contextlib
import json
-import platform
import re
import sqlite3
import time
@@ -264,11 +263,6 @@ def is_libvirtd_up():
"""
Checks if libvirtd.service is up.
"""
- distro, _, _ = platform.linux_distribution()
- if distro.lower() == 'ubuntu':
- cmd = ['systemctl', 'is-active', 'libvirt-bin.service']
- else:
- cmd = ['systemctl', 'is-active', 'libvirtd.service']
-
+ cmd = ['systemctl', 'is-active', 'libvirtd.service']
output, error, rc = run_command(cmd, silent=True)
return True if output == 'active\n' else False
--
2.7.4
7 years, 4 months
[PATCH] [Kimchi] Fixed resize volume click input number in virtualization->storag
by rajgupta＠linux.vnet.ibm.com
From: Rajat Gupta <rajat.triumph(a)gmail.com>
Added on change event and size validation
Signed-off-by: Rajat Gupta <rajat.triumph(a)gmail.com>
---
ui/js/src/kimchi.storagepool_resize_volume_main.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/js/src/kimchi.storagepool_resize_volume_main.js b/ui/js/src/kimchi.storagepool_resize_volume_main.js
index 791cc1d..1f5b4db 100644
--- a/ui/js/src/kimchi.storagepool_resize_volume_main.js
+++ b/ui/js/src/kimchi.storagepool_resize_volume_main.js
@@ -23,8 +23,8 @@ kimchi.sp_resize_volume_main = function() {
var form = $('form#form-sp-resize-volume');
$(addButton).prop('disabled',true);
- $(size).on('keyup', function(){
- if($(this).val().length !==0) {
+ $(size).on('keyup change', function(){
+ if($(this).val() > 0) {
addButton.prop('disabled', false);
} else{
addButton.prop('disabled',true);
--
2.1.0
7 years, 4 months
[PATCH] [Kimchi] Recognize openSUSE 42.2 ISO
by Aline Manera
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
isoinfo.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/isoinfo.py b/isoinfo.py
index e5725e2..6876672 100644
--- a/isoinfo.py
+++ b/isoinfo.py
@@ -111,8 +111,7 @@ iso_dir = [
'openSUSE-DVD-i586-Build0039|openSUSE-DVD-x86_640039'),
('opensuse', '12.2',
'openSUSE-DVD-i586-Build0167|openSUSE-DVD-x86_640167'),
- ('opensuse', '42.1',
- 'openSUSE-Leap-42.1-DVD-x86_64026|openSUSE-Leap-42.1-NET-x86_64026'),
+ ('opensuse', lambda m: m.group(1), 'openSUSE-Leap-(\d+\.\d+)'),
('rhel', '4.8', 'RHEL/4-U8'),
('rhel', lambda m: m.group(2), 'RHEL(-LE)?[_/-](\d+\.\d+)'),
('debian', lambda m: m.group(1), 'Debian (\d+\.\d+)'),
--
2.7.4
7 years, 4 months
RFC – Hypervisor Performance Manager for s390x (KVM IBM z Systems)
by Chandra Shekhar Reddy Potula
Proposal of introducing a new plugin – Hypervisor Performance
Manager(HPM) for s390x (KVM IBM z Systems).
*Abstract*
z Systems Hypervisor Performance Manager (zHPM) can be used to bring a
goal-oriented approach to the performance management of a hypervisor.
zHPM dynamically manages resource allocation when contention occurs
based on user-specified policies associated with performance objectives.
*Introduction about HPM:*
zHPM provides the following capabilities:
·APIs to enable a virtualization management solution for fully operating
zHPM.
·These APIs are provided using RESTful web services. The zHPM APIs
provide the following functions:
–Definition of workload resource groups and performance policy.
–Collection of virtual server and hypervisor performance metrics related
to understanding of performance goal achievement.
–Operational controls.
·A command line interface that provides similar functions as the zHPM APIs.
·Collection of hypervisor level and virtual server level performance
metrics to help set up performance goals, and support virtual server CPU
management.
·Management of CPU resource allocation to virtual servers in order to
meet goals
Workload resource groups
A workload resource group is a collection of virtual servers that host a
business application. The workload resource group provides a "management
view" of these virtual servers. By defining a workload resource group
you can manage hypervisor resources based on the requirements of the
business applications deployed on the KVM for IBM z Systems hypervisor.
Performance policies
In zHPM, a performance policy defines goals for virtual servers in a
workload resource group. You can define performance policies and express
a business goal and an importance level for the virtual servers that are
part of a workload resource group. zHPM then monitors and manages
hypervisor resources allocated to the virtual servers based on these
performance policies.
Service class
the service class a virtual server is associated with.
*Use Cases:*
New plugin Hypervisor Performance Manager(HPM) UI toprovide the
following operations support:
1.Performance Policies
a.List
b.Add/Update/Remove
c.Import/Export
2.Workload Resource Group (WRG) configuration
a.List WRG’s
b.Get/Create/Edit/Delete WRG
c.Add/Remove Virtual Server from WRG
3.Service Classes
a.Details of Service Class
b.Fetch or update Virtual Server information
4.Virtual Server CPU Management
a.Get/Enable/Disable CPU management
b.Report dynamic CPU resource adjustments
REST API’s Supported by HPM.
1.Workload Resource Group
a.GET /zhpm/wsapi/v1/workload-resource-groups
b.GET /zhpm/wsapi/v1/workload-resource-groups/detail
c.GET /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id}
d.POST /zhpm/wsapi/v1/workload-resource-groups
e.DELETE /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id}
f.POST /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id}/actions
2.Performance Policies
a.POST /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id}
b.POST /zhpm/wsapi/v1/workload-resource-groups/default
c.POST /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-ids
d.GET /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id}
e.GET /zhpm/wsapi/v1/workload-resource-groups/detail
3.Virtual Servers
a.GET /zhpm/wsapi/v1/virtual-servers
b.GET /zhpm/wsapi/v1/virtual-servers/{vs-resource-id}
c.POST /zhpm/wsapi/v1/virtual-servers/{vs-resource-id}
d.GET /zhpm/wsapi/v1/virtual-servers/detail
4.Metrics
a.GET /zhpm/wsapi/v1/metrics/raw/hypervisor
b.GET /zhpm/wsapi/v1/metrics/calculated/hypervisor
c.GET /zhpm/wsapi/v1/metrics/raw/workload-resource-groups
d.GET /zhpm/wsapi/v1/metrics/calculated/workload-resource-groups
e.GET /zhpm/wsapi/v1/metrics/raw/workload-resource-groups/default
f.GET /zhpm/wsapi/v1/metrics/calculated/workload-resource-groups/default
g.GET /zhpm/wsapi/v1/metrics/raw/workload-resource-groups/{wrg-resource-id}
a.GET
/zhpm/wsapi/v1/metrics/calculated/workload-resource-groups/{wrg-resource-id}
5.CPU Management
a.GET /zhpm/wsapi/v1/mgmt-levels
b.POST /zhpm/wsapi/v1/mgmt-levels
c.GET /zhpm/wsapi/v1/dynamic-resource-adjustments
6.Memory Management
TBD
The following code changes will be made in support of plugin:
1.Plugin infrastructure
2.Backend python code support for Kimchi/Ginger for the REST API development
3.Frontend HTML5/JavaScript code.
More details to be followed like detailed use cases, REST API and
mock-ups ...
Further documentation can be found @
http://www.ibm.com/support/knowledgecenter/SSNW54_1.1.1/com.ibm.kvm.v111....
Please feel free to comment !!!
Thanks and Regards
Chandra
7 years, 4 months
[PATCH ][Wok] Fix for Multi-culture UI issue in wok settings tab
by nagamanc＠linux.vnet.ibm.com
From: Nagamani Chennuboina <nagamanc(a)linux.vnet.ibm.com>
Issue is, text in table header/cells are truncated in settings tab.
Changed required HTML,css and JS files
Nagamani Chennuboina (1):
Fix for Multi-culture UI issue in wok settings tab
ui/css/settings.css | 1 +
ui/css/src/settings.scss | 3 ++-
ui/css/wok.css | 2 +-
ui/js/wok.bootgrid.js | 21 +++++++++++++++++++++
ui/js/wok.user-log.js | 18 +++++++++++++++---
ui/pages/wok-ui.html.tmpl | 4 ++--
6 files changed, 42 insertions(+), 7 deletions(-)
--
2.1.0
7 years, 4 months
[PATCH] [Wok] Fix to provide date convertion as per locale
by jkatta＠linux.vnet.ibm.com
From: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com>
This fix provides template and utils methods for the date convertion
as per the locale settings from UI login page
Signed-off-by: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com>
---
src/wok/template.py | 26 +++++++++++++++++++++++++-
src/wok/utils.py | 10 ++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/src/wok/template.py b/src/wok/template.py
index 43a34db..e8d083e 100644
--- a/src/wok/template.py
+++ b/src/wok/template.py
@@ -22,10 +22,13 @@
import cherrypy
import errno
import json
+import threading
import time
+import locale
+
from Cheetah.Template import Template
from glob import iglob
-
+from contextlib import contextmanager
from wok import config as config
from wok.config import paths
@@ -133,3 +136,24 @@ def render(resource, data):
return render_cheetah_file(resource, data)
else:
raise cherrypy.HTTPError(406)
+
+
+def get_locale():
+ cookie = cherrypy.request.cookie
+ if "wokLocale" in cookie.keys():
+ return [cookie["wokLocale"].value]
+ langs = get_lang()
+ return langs
+
+
+LOCALE_LOCK = threading.Lock()
+
+
+@contextmanager
+def setlocale(name):
+ with LOCALE_LOCK:
+ saved = locale.setlocale(locale.LC_TIME)
+ try:
+ yield locale.setlocale(locale.LC_TIME, name)
+ finally:
+ locale.setlocale(locale.LC_TIME, saved)
diff --git a/src/wok/utils.py b/src/wok/utils.py
index 9a08001..807893d 100644
--- a/src/wok/utils.py
+++ b/src/wok/utils.py
@@ -42,6 +42,7 @@ from threading import Timer
from wok.config import paths, PluginPaths
from wok.exception import InvalidParameter, TimeoutExpired
from wok.stringutils import decode_value
+from wok.template import get_locale, setlocale
wok_log = cherrypy.log.error_log
@@ -619,3 +620,12 @@ def upgrade_objectstore_schema(objstore=None, field=None):
wok_log.error("Cannot upgrade objectstore schema: %s" % e.args[0])
return False
return True
+
+
+def dateNtime_to_locale(dateNtime):
+ dt = datetime.strptime(dateNtime, "%Y-%m-%d %H:%M:%S")
+ cokies_locale = get_locale()
+ cokies_locale = cokies_locale[0].replace("-", "_")
+ with setlocale(cokies_locale):
+ dt_locale = (dt.strftime('%c'))
+ return dt_locale
--
2.7.4
7 years, 4 months
[PATCH] [Wok] Fix non-relative paths
by Lucio Correia
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
ui/js/wok.user-log.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js
index bac5439..f7659ee 100644
--- a/ui/js/wok.user-log.js
+++ b/ui/js/wok.user-log.js
@@ -173,7 +173,7 @@ wok.initUserLog = function() {
$(".content-area", "#wokSettings").css("height", "100%");
wok.initUserLogConfig();
$('#advanced-search-button').on('click',function(){
- wok.window.open('/tabs/settings-search.html');
+ wok.window.open('tabs/settings-search.html');
});
$("#download-button").on('click',function(){
--
2.7.4
7 years, 4 months
[PATCH] [Wok] Fix ip-address.js directory
by Lucio Correia
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
ui/libs/datatables/js/plugins/ip-address/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/libs/datatables/js/plugins/ip-address/Makefile.am b/ui/libs/datatables/js/plugins/ip-address/Makefile.am
index f823bae..b48f817 100644
--- a/ui/libs/datatables/js/plugins/ip-address/Makefile.am
+++ b/ui/libs/datatables/js/plugins/ip-address/Makefile.am
@@ -16,6 +16,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-datatablesipaddressjsdir = $(datadir)/wok/ui/libs/datatables/js/plugins/ip-address/ip-address.js
+datatablesipaddressjsdir = $(datadir)/wok/ui/libs/datatables/js/plugins/ip-address
dist_datatablesipaddressjs_DATA = $(wildcard *.js) $(NULL)
--
2.7.4
7 years, 4 months
[PATCH] Do not install firewalld conf in Debian
by Lucio Correia
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
Makefile.am | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e7ab86e..5f91a62 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,9 +95,6 @@ install-deb: install
$(DESTDIR)/etc/init/wokd.conf; \
fi
$(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/wok/
- $(MKDIR_P) $(DESTDIR)/usr/lib/firewalld/services
- cp -R $(top_srcdir)/src/firewalld.xml \
- $(DESTDIR)/usr/lib/firewalld/services/wokd.xml
deb: contrib/make-deb.sh
--
2.7.4
7 years, 4 months
