From a406239b9b448ec221db4021378ed42ed7adb551 Mon Sep 17 00:00:00 2001 From: Anish Mangal Date: Thu, 13 Jun 2019 18:25:09 +0000 Subject: [PATCH 1/2] Fix bug in kalite parsing of regex for ifconfig output --- roles/kalite/tasks/install.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index 6ccd12943..cf052470c 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -78,3 +78,12 @@ - { src: 'kalite-serve.service.j2', dest: '/etc/systemd/system/kalite-serve.service', mode: '0644'} - { src: 'kalite.sh.j2', dest: '/usr/bin/kalite', mode: '0755'} - { src: 'kalite.conf', dest: '/etc/{{ apache_config_dir }}', mode: '0644'} + +- name: Fix kalite bug in regex parsing ifconfig output + replace: + path: /usr/local/kalite/venv/local/lib/python2.7/site-packages/kalite/packages/dist/ifcfg/parser.py + regexp: 'a-zA-Z0-9' + replace: 'a-zA-Z0-9\-' + + + From 95c9545227a167ae0eebb022acc6173c0610a108 Mon Sep 17 00:00:00 2001 From: A Holt Date: Sat, 22 Jun 2019 11:24:26 -0400 Subject: [PATCH 2/2] Explanation added, for Ansible output --- roles/kalite/tasks/install.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kalite/tasks/install.yml b/roles/kalite/tasks/install.yml index cf052470c..8089696b3 100644 --- a/roles/kalite/tasks/install.yml +++ b/roles/kalite/tasks/install.yml @@ -79,7 +79,7 @@ - { src: 'kalite.sh.j2', dest: '/usr/bin/kalite', mode: '0755'} - { src: 'kalite.conf', dest: '/etc/{{ apache_config_dir }}', mode: '0644'} -- name: Fix kalite bug in regex parsing ifconfig output +- name: Fix KA Lite bug in regex parsing ifconfig output, for @m-anish's network names that contain dashes replace: path: /usr/local/kalite/venv/local/lib/python2.7/site-packages/kalite/packages/dist/ifcfg/parser.py regexp: 'a-zA-Z0-9'