Merge pull request #21 from ait-aecid/development

Development

tasks/main.yml

@@ -10,11 +10,6 @@
   when: ansible_distribution == "Debian" and ansible_distribution_major_version < '11'
   tags: vars
 
-- name: Include Ubuntu 18.04 Variables
-  include_vars: debian-buster.yml
-  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version < '20'
-  tags: vars
-
 - name: Include Debian Variables
   include_vars: debian.yml
   when: ansible_distribution == "Debian" and ansible_distribution_major_version >= '11'
@@ -121,24 +116,55 @@
   include: buster.yml
   when: ansible_distribution == "Debian" and ansible_distribution_major_version < '11'
 
-- name: Run Ubuntu 18.04 Tasks
-  include: buster.yml
-  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version < '20'
-
 - name: Run Debian > 10  Tasks
   include: debian.yml
   when: ansible_distribution == "Debian" and ansible_distribution_major_version > '10'
 
 - name: Run Ubuntu > 18 Tasks
   include: debian.yml
-  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version > '18'
+  when: ansible_distribution == "Ubuntu" and ansible_distribution_major_version >= '20'
 
 - name: Install orjson
   pip:
     name: orjson
     executable: pip3
     state: latest
 
+- name: Install pyzmq
+  pip:
+    name: pyzmq
+    executable: pip3
+    state: latest
+
+- name: Find zmq
+  find:
+    paths: "/usr"
+    patterns: 'zmq'
+    recurse: yes
+  register: zmq
+
+- name: Find pyzmq.libs
+  find:
+    paths: "/usr"
+    patterns: 'pyzmq.libs'
+    recurse: yes
+  register: pyzmqlibs
+
+- name: Link zmq
+  file:
+    src: "{{ item.path }}"
+    dest: "/etc/aminer/conf-enabled/{{item.path.split('/')[-1]}}"
+    state: link
+  with_items: "{{zmq.files }}"
+
+- name: Link pyzmq.libs
+  file:
+    src: "{{ item.path }}"
+    dest: "/etc/aminer/conf-enabled/{{item.path.split('/')[-1]}}"
+    state: link
+  with_items: "{{pyzmqlibs.files }}"
+
+
 - name: Find json.cpython
   find:
     paths: "/usr"
@@ -233,14 +259,20 @@
     dest: /etc/aminer/conf-enabled/statsmodels
     state: link
 
+- name: Link python3-defusedxml
+  file:
+    src: "{{aminer_pythonpath}}/defusedxml"
+    dest: /etc/aminer/conf-enabled/defusedxml
+    state: link
+
 - name: Create man-page for aminer
   shell:
-    cmd: xsltproc --output /usr/share/man/man1/aminer.1  -''-nonet -''-param man.charmap.use.subset "0" -''-param make.year.ranges "1" -''-param make.single.year.ranges "1" /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl {{aminer_repopath}}/debian/aminer.1.xml && gzip /usr/share/man/man1/aminer.1
+    cmd: xsltproc --output /usr/share/man/man1/aminer.1  -''-nonet -''-param man.charmap.use.subset "0" -''-param make.year.ranges "1" -''-param make.single.year.ranges "1" /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl {{aminer_repopath}}/docs/manpages/aminer.1.xml && gzip /usr/share/man/man1/aminer.1
     creates: /usr/share/man/man1/aminer.1.gz
 
 - name: Create man-page for aminerremotecontrol
   shell:
-    cmd: xsltproc --output /usr/share/man/man1/aminerremotecontrol.1  -''-nonet -''-param man.charmap.use.subset "0" -''-param make.year.ranges "1" -''-param make.single.year.ranges "1" /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl {{aminer_repopath}}/debian/aminerremotecontrol.1.xml && gzip /usr/share/man/man1/aminerremotecontrol.1
+    cmd: xsltproc --output /usr/share/man/man1/aminerremotecontrol.1  -''-nonet -''-param man.charmap.use.subset "0" -''-param make.year.ranges "1" -''-param make.single.year.ranges "1" /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl {{aminer_repopath}}/docs/manpages/aminerremotecontrol.1.xml && gzip /usr/share/man/man1/aminerremotecontrol.1
     creates: /usr/share/man/man1/aminerremotecontrol.1.gz
 
 # - name: Run RedHat Tasks

vars/debian-buster.yml

@@ -10,6 +10,8 @@ aminer_packages:
         - python3-scipy
         - python3-urllib3
         - python3-statsmodels
+        - python3-defusedxml
+        - libzmq3-dev
         - xsltproc
         - docbook-xsl
         - gzip

vars/debian.yml

@@ -12,6 +12,8 @@ aminer_packages:
         - python3-kafka
         - python3-urllib3
         - python3-statsmodels
+        - python3-defusedxml
+        - libzmq3-dev
         - xsltproc
         - docbook-xsl
         - gzip