sync planet-winter changes #29

pablodav · 2020-08-06T02:27:37Z

@planet-winter

Do you think we should sync our reports?

I always prefer to be in sync to not have duble work.

There are some changes that I would prefer to do different, I will explain on merge request.

refs #28

get up to date with latest CoffeITWorks master to add zfs_script

closes CoffeeITWorks#18

1.7.0

fix bug introduced in latest updates

update molecule to v3

update tests and support with debian 10

…S and set sbindir according to LSB

pablodav · 2020-08-06T02:30:37Z

molecule/default/INSTALL.rst

@@ -1,16 +0,0 @@
-*******
-Install


@planet-winter why is this file deleted?

I have no clue... ;-)

pablodav · 2020-08-06T02:31:35Z

tasks/build-burp.yml

  shell: cd {{ download_dir }}/{{ burpsrc }} && make install creates={{ burp_bin_path }}
-  notify: 
-    - restart burp server
-    - restart burp server systemd


During upgrades, it is required
@planet-winter

During upgrades, it is required
Yes!
However ansible could not find the given handlers as there is no handlers directory in the client role. If this is in the server role only, the client role only runs together with the server role. -> should add a handlers dir and handlers main.yml

pablodav · 2020-08-06T02:34:03Z

tasks/freebsd-12.yml

@@ -0,0 +1,8 @@
+---
+
+- name: freebsd | install logrotate


looks like you forgot to call this file from tasks/main.yml ?

@planet-winter

Yes! It is obsolete anyway as it does the same as the freebsd.yml which is called for all freebsd versions.

I probably was on autopilot, as I usually use a similar structure to this to flexibly get custom variables. It is easy to enhance:

- name: gather os specific variables include_vars: "{{ item }}" with_first_found: - files: - "{{ ansible_distribution|lower }}-{{ ansible_distribution_version }}.yml" - "{{ ansible_distribution|lower }}-{{ ansible_distribution_release }}.yml" - "{{ ansible_distribution|lower }}-{{ ansible_distribution_major_version }}.yml" - "{{ ansible_distribution|lower }}.yml" - "{{ ansible_os_family|lower }}.yml" - defaults.yml paths: - ../vars skip: True

just seen you are using this already.
Same could be done with tasks though.

pablodav · 2020-08-06T02:38:09Z

tasks/main.yml

+    src: "zfs_script"
+    owner: root
+    group: "{{ root_group }}"
+    mode: 0755


when statment missing, only copy when burp_client_backup_script is true, using | bool.

pablodav · 2020-08-06T02:39:19Z

templates/burp.conf.j2

 {% endfor %}
+{% endif %}

+{% if burp_client_backup_script is defined %}


Probably should be burp_client_backup_script_bool with false by default?

Yes! sounds sensible.
However please note I'm having issues using ZFS backup over FIFO with this script. It's a long time ago would need to look into this to be more precise. Maybe not of use for you.

pablodav · 2020-08-06T02:42:19Z

vars/Debian.yml

@@ -1,35 +0,0 @@
---
-# file: vars/Debian.yml


Deleting this file will break support to others Debian based distributions like most Ubuntu versions.

Best approach is:

Use Debian.yml to support all the latest Debian based distributions.

Add only Debian-Mayorversion.yml or Ubuntu-Mayorversion.yml in case when you need to add compatibility to older versions that have different package names for example.

hmm. Lousy of me to delete it ;-) makes no sense.
I usually keep a file for each mayor version anyway in my roles to be explicit for what OS versions it works and I have it tested with.

pablodav · 2020-08-06T02:43:50Z

vars/Debian-8.yml

@@ -1,5 +1,5 @@
 ---
-# file: vars/Debian-8.yml
+# file: vars/Debian.yml


File is still Debian-8.yml

pablodav · 2020-08-06T02:44:16Z

vars/Debian-8.yml

  - libc6        # from package dependencies
  - libacl1      # from package dependencies
-  - libssl1.0.0  # from package dependencies
+  - libssl1.1    # from package dependencies (debian9,debian10,Ubuntu18+)


Debian-8 will not work with this library

pablodav · 2020-08-06T02:46:57Z

ERROR: Idempotence test failed because of the following tasks:

[ansible_burp2_client-01] => coffeeitworks.burp2_server : manual_delete | create burp folders
[ansible_burp2_client-02] => coffeeitworks.burp2_server : manual_delete | create burp folders
[ansible_burp2_client-04] => coffeeitworks.burp2_server : manual_delete | create burp folders
[ansible_burp2_client-03] => coffeeitworks.burp2_server : manual_delete | create burp folders
[ansible_burp2_client-04] => ansible_burp2_client : ensure /etc/cron.d exists
[ansible_burp2_client-02] => ansible_burp2_client : ensure /etc/cron.d exists
[ansible_burp2_client-01] => ansible_burp2_client : ensure /etc/cron.d exists
[ansible_burp2_client-03] => ansible_burp2_client : ensure /etc/cron.d exists
The command "molecule idempotence" exited with 1.

pablodav · 2020-08-06T02:53:03Z

manual_delete should be mode: '0750' to sync with burp_server role.

planet-winter · 2020-08-07T07:49:23Z

ERROR: Idempotence test failed because of the following tasks:

* [ansible_burp2_client-01] => coffeeitworks.burp2_server : manual_delete | create burp folders

* [ansible_burp2_client-02] => coffeeitworks.burp2_server : manual_delete | create burp folders

* [ansible_burp2_client-04] => coffeeitworks.burp2_server : manual_delete | create burp folders

* [ansible_burp2_client-03] => coffeeitworks.burp2_server : manual_delete | create burp folders

* [ansible_burp2_client-04] => ansible_burp2_client : ensure /etc/cron.d exists

* [ansible_burp2_client-02] => ansible_burp2_client : ensure /etc/cron.d exists

* [ansible_burp2_client-01] => ansible_burp2_client : ensure /etc/cron.d exists

* [ansible_burp2_client-03] => ansible_burp2_client : ensure /etc/cron.d exists
  The command "molecule idempotence" exited with 1.

Is this due to the missing binary to delete in the new sbindir path? (Still in old path)

planet-winter and others added 14 commits March 2, 2018 15:23

Merge pull request #1 from CoffeeITWorks/master

2875a9d

get up to date with latest CoffeITWorks master to add zfs_script

Merge pull request CoffeeITWorks#19 from CoffeeITWorks/develop

4a50457

closes CoffeeITWorks#18

added Debian-10 and local changes

7a9fb5b

Merge pull request CoffeeITWorks#20 from CoffeeITWorks/develop

8ef028e

1.7.0

Merge pull request CoffeeITWorks#22 from CoffeeITWorks/develop

ae78660

fix bug introduced in latest updates

Merge pull request CoffeeITWorks#26 from CoffeeITWorks/develop

f4ae5d6

update molecule to v3

Merge pull request CoffeeITWorks#27 from CoffeeITWorks/develop

81fcc1a

update tests and support with debian 10

resolved merged with CoffeeITWorks master

d4f2ae8

fix for left out merge

f740365

removed restart of server after client install

9a62f26

CFLAGS not working on FreeBSD removed

984ae07

CFLAGS not working on FreeBSD removed

354c937

should fix CoffeeITWorks#28 and make it run with lesss than 4 cores

3500c58

fix for CoffeeITWorks#28 compiling with dynamically set number of CPU…

91d4c95

…S and set sbindir according to LSB

pablodav commented Aug 6, 2020

View reviewed changes

planet-winter added 3 commits August 7, 2020 12:29

fixed CFLAGS line

2dc73bb

fix CFLAGS line

48552bd

fixed client cronjob burp path

8678ad5

		@@ -1,16 +0,0 @@
		*******
		Install

sync planet-winter changes #29

Are you sure you want to change the base?

sync planet-winter changes #29

Uh oh!

Conversation

pablodav commented Aug 6, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pablodav commented Aug 6, 2020

Uh oh!

pablodav commented Aug 6, 2020

Uh oh!

planet-winter commented Aug 7, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants