From e776a3dc0d43104a65b0ee4b6ecd6eadd5e4c2fa Mon Sep 17 00:00:00 2001 From: Jens Heinrich Date: Fri, 24 May 2019 09:06:52 +0200 Subject: [PATCH 1/7] added msmtp as sendmail --- handlers/main.yml | 5 ++ tasks/FreeBSD-msmtp-as-sendmail.yml | 115 +++++++++++++++++++++++++ templates/msmtp-as-sendmail_msmtprc.j2 | 26 ++++++ vars/msmtp-as-sendmail.yml | 13 +++ 4 files changed, 159 insertions(+) create mode 100644 tasks/FreeBSD-msmtp-as-sendmail.yml create mode 100644 templates/msmtp-as-sendmail_msmtprc.j2 create mode 100644 vars/msmtp-as-sendmail.yml diff --git a/handlers/main.yml b/handlers/main.yml index b0fbc55..cd445ef 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -35,3 +35,8 @@ loop: - sdpd - hpsecd + +- name: new aliases + become: true + command: newaliases + diff --git a/tasks/FreeBSD-msmtp-as-sendmail.yml b/tasks/FreeBSD-msmtp-as-sendmail.yml new file mode 100644 index 0000000..ccb85a6 --- /dev/null +++ b/tasks/FreeBSD-msmtp-as-sendmail.yml @@ -0,0 +1,115 @@ +--- +- include_vars: msmtp-as-sendmail.yml + +- name: install msmtp + package: + name: "{{ msmtp_package }}" + state: present + become: true + tags: + - installation + +- name: create systemwide msmtp config + template: + dest: "{{ msmtprc }}" + src: "../mutt/templates/msmtprc.j2" + become: true + tags: + - configuration + +- name: "set msmtp as mta" + lineinfile: + path: "{{ mailrc | default(/etc/mail.rc) }}" + regexp: "^{{ item.name }}" + line: "{{ item.name }}={{ item.val }}" + become: true + loop: "{{ sysctl_setting }}" + tags: + - configuration + vars: + sysctl_setting: + - name: "set mta" + val: "{{ msmtp_path }}" + +- name: "set an adress for root" + lineinfile: + path: "{{ aliases | default(/etc/aliases) }}" + regexp: "^{{ item.name }}" + line: "{{ item.name }}: {{ item.val }}" + become: true + loop: "{{ sysctl_setting }}" + tags: + - configuration + vars: + sysctl_setting: + - name: "root" + val: "{{ root_mail }}" + - name: "default" + val: "root" + when: root_mail is defined + notify: new aliases + + + + + +- name: "enable local_unbound" + lineinfile: + path: "/etc/rc.conf" + regexp: "^{{ item.name }}" + line: "{{ item.name }}={{ item.val }}" + become: true + loop: "{{ sysctl_setting }}" + tags: + - configuration + vars: + sysctl_setting: + - name: "local_unbound_enable" + val: "YES" + +- name: "get opennic hints" + shell: "{{ hints_opennic_cmd }}" + become: true + tags: + - installation + - configuration + +- name: "get named hints" + get_url: + url: "{{ hints_named_url }}" + dest: "{{ hints_named }}" + become: true + tags: + - installation + - configuration + +- name: manage resolv.conf + template: + dest: /etc/resolv.conf + src: templates/resolv.conf.j2 + become: true + tags: + - configuration + +- name: "generate configs" + template: + src: "{{ config.src }}" + dest: "{{ config.dest }}" + become: true + loop: "{{ local_unbound_files }}" + loop_control: + loop_var: config + tags: + - configuration + notify: "restart local_unbound" + +- name: "start local_unbound" + service: + name: "local_unbound" + state: started + become: true + tags: + - service + - configuration + + diff --git a/templates/msmtp-as-sendmail_msmtprc.j2 b/templates/msmtp-as-sendmail_msmtprc.j2 new file mode 100644 index 0000000..0163ed5 --- /dev/null +++ b/templates/msmtp-as-sendmail_msmtprc.j2 @@ -0,0 +1,26 @@ +{{ ansible_managed | comment }} + +# https://dev.gentoo.org/~tomka/mail.html + +# Set default values for all following accounts. +defaults +tls on +tls_certcheck off +#tls_trust_file /usr/home/jens/.dotfiles/mutt/importedcerts +logfile ~/.msmtp.log +syslog on + + +# uberspace_host +# +account uberspace_thinkpad +host mail.alioth.uberspace.de +from admin-host-{{ ansible_fqdn }}@927589452.de +user high5-thinkpad +port 587 +tls_starttls on +auth on +password iohieFood2quah8e + +account default : uberspace_host + diff --git a/vars/msmtp-as-sendmail.yml b/vars/msmtp-as-sendmail.yml new file mode 100644 index 0000000..7d2bc1a --- /dev/null +++ b/vars/msmtp-as-sendmail.yml @@ -0,0 +1,13 @@ +--- +mail_accounts: +- name: "uberspace_thinkpad" + password: "iohieFood2quah8e" + username: "high5-thinkpad" + imap: mail.alioth.uberspace.de + smtp: mail.alioth.uberspace.de + from: admin@927589452.de + default: yes + + msmtprc: "{{ config_path }}/msmtprc" + + root_mail: "ansible-host-{{ ansible_fqdn }}@927589452.de" From 0d5e6b7c33eec1fa135ac7e95605183dcc8eb7dd Mon Sep 17 00:00:00 2001 From: Jens Heinrich Date: Fri, 24 May 2019 09:08:09 +0200 Subject: [PATCH 2/7] removed basic template, as this is reused from the mutt role --- templates/msmtp-as-sendmail_msmtprc.j2 | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 templates/msmtp-as-sendmail_msmtprc.j2 diff --git a/templates/msmtp-as-sendmail_msmtprc.j2 b/templates/msmtp-as-sendmail_msmtprc.j2 deleted file mode 100644 index 0163ed5..0000000 --- a/templates/msmtp-as-sendmail_msmtprc.j2 +++ /dev/null @@ -1,26 +0,0 @@ -{{ ansible_managed | comment }} - -# https://dev.gentoo.org/~tomka/mail.html - -# Set default values for all following accounts. -defaults -tls on -tls_certcheck off -#tls_trust_file /usr/home/jens/.dotfiles/mutt/importedcerts -logfile ~/.msmtp.log -syslog on - - -# uberspace_host -# -account uberspace_thinkpad -host mail.alioth.uberspace.de -from admin-host-{{ ansible_fqdn }}@927589452.de -user high5-thinkpad -port 587 -tls_starttls on -auth on -password iohieFood2quah8e - -account default : uberspace_host - From f1b6f5f102745628f0e00ce8f30b00d0839f428e Mon Sep 17 00:00:00 2001 From: Jens Heinrich Date: Fri, 24 May 2019 09:09:27 +0200 Subject: [PATCH 3/7] moved msmtp to own role --- tasks/FreeBSD-msmtp-as-sendmail.yml | 115 ---------------------------- vars/msmtp-as-sendmail.yml | 13 ---- 2 files changed, 128 deletions(-) delete mode 100644 tasks/FreeBSD-msmtp-as-sendmail.yml delete mode 100644 vars/msmtp-as-sendmail.yml diff --git a/tasks/FreeBSD-msmtp-as-sendmail.yml b/tasks/FreeBSD-msmtp-as-sendmail.yml deleted file mode 100644 index ccb85a6..0000000 --- a/tasks/FreeBSD-msmtp-as-sendmail.yml +++ /dev/null @@ -1,115 +0,0 @@ ---- -- include_vars: msmtp-as-sendmail.yml - -- name: install msmtp - package: - name: "{{ msmtp_package }}" - state: present - become: true - tags: - - installation - -- name: create systemwide msmtp config - template: - dest: "{{ msmtprc }}" - src: "../mutt/templates/msmtprc.j2" - become: true - tags: - - configuration - -- name: "set msmtp as mta" - lineinfile: - path: "{{ mailrc | default(/etc/mail.rc) }}" - regexp: "^{{ item.name }}" - line: "{{ item.name }}={{ item.val }}" - become: true - loop: "{{ sysctl_setting }}" - tags: - - configuration - vars: - sysctl_setting: - - name: "set mta" - val: "{{ msmtp_path }}" - -- name: "set an adress for root" - lineinfile: - path: "{{ aliases | default(/etc/aliases) }}" - regexp: "^{{ item.name }}" - line: "{{ item.name }}: {{ item.val }}" - become: true - loop: "{{ sysctl_setting }}" - tags: - - configuration - vars: - sysctl_setting: - - name: "root" - val: "{{ root_mail }}" - - name: "default" - val: "root" - when: root_mail is defined - notify: new aliases - - - - - -- name: "enable local_unbound" - lineinfile: - path: "/etc/rc.conf" - regexp: "^{{ item.name }}" - line: "{{ item.name }}={{ item.val }}" - become: true - loop: "{{ sysctl_setting }}" - tags: - - configuration - vars: - sysctl_setting: - - name: "local_unbound_enable" - val: "YES" - -- name: "get opennic hints" - shell: "{{ hints_opennic_cmd }}" - become: true - tags: - - installation - - configuration - -- name: "get named hints" - get_url: - url: "{{ hints_named_url }}" - dest: "{{ hints_named }}" - become: true - tags: - - installation - - configuration - -- name: manage resolv.conf - template: - dest: /etc/resolv.conf - src: templates/resolv.conf.j2 - become: true - tags: - - configuration - -- name: "generate configs" - template: - src: "{{ config.src }}" - dest: "{{ config.dest }}" - become: true - loop: "{{ local_unbound_files }}" - loop_control: - loop_var: config - tags: - - configuration - notify: "restart local_unbound" - -- name: "start local_unbound" - service: - name: "local_unbound" - state: started - become: true - tags: - - service - - configuration - - diff --git a/vars/msmtp-as-sendmail.yml b/vars/msmtp-as-sendmail.yml deleted file mode 100644 index 7d2bc1a..0000000 --- a/vars/msmtp-as-sendmail.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -mail_accounts: -- name: "uberspace_thinkpad" - password: "iohieFood2quah8e" - username: "high5-thinkpad" - imap: mail.alioth.uberspace.de - smtp: mail.alioth.uberspace.de - from: admin@927589452.de - default: yes - - msmtprc: "{{ config_path }}/msmtprc" - - root_mail: "ansible-host-{{ ansible_fqdn }}@927589452.de" From 78d169fd8fd47ec623aa050a928c9d58b54b03fe Mon Sep 17 00:00:00 2001 From: 927589452 Date: Thu, 12 Sep 2019 21:27:19 +0200 Subject: [PATCH 4/7] added debian power --- tasks/main.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index eb14c71..5751595 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -23,6 +23,28 @@ - FreeBSD-shortcuts.yml - keyboard.yml +- include_tasks: "{{ tweak }}" + when: ansible_facts['os_family'] == "Debian" + tags: + - installation + - configuration + - vars + loop_control: + loop_var: tweak + loop: + - Debian-power.yml + +- include_tasks: "{{ tweak }}" + when: ansible_facts['os_family'] == "Archlinux" + tags: + - installation + - configuration + - vars + loop_control: + loop_var: tweak + loop: + - Archlinux-power.yml + - include_tasks: "{{ tweaks }}" when: "ansible_system == 'FreeBSD'" tags: From 8a783d63fb039dc9dbdaf47399b6c9a1b7a90088 Mon Sep 17 00:00:00 2001 From: 927589452 Date: Thu, 12 Sep 2019 21:27:39 +0200 Subject: [PATCH 5/7] add freebsd power --- tasks/FreeBSD-power.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tasks/FreeBSD-power.yml b/tasks/FreeBSD-power.yml index a0cf2c6..aec3347 100644 --- a/tasks/FreeBSD-power.yml +++ b/tasks/FreeBSD-power.yml @@ -42,6 +42,16 @@ tags: - configuration +- name: FreeBSD power| tweaks for use as a desktop + blockinfile: + path: "/boot/loader.conf" + block: "{{ lookup('file', 'block-FreeBSD-power-deskop.j2') }}" + marker: "# {mark} ANSIBLE MANAGED BLOCK tweaks for desktop" + become: true + tags: + - configuration + + - name: setup suspend on lid close sysctl: name: "{{ item.name }}" From c5d96917dc4b468bf525cf2482b5733efb79ef8f Mon Sep 17 00:00:00 2001 From: 927589452 Date: Thu, 12 Sep 2019 21:28:06 +0200 Subject: [PATCH 6/7] fix em0 driver --- tasks/FreeBSD-em0.yml | 22 ++++++++++++++++++++++ tasks/main.yml | 9 ++++----- 2 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 tasks/FreeBSD-em0.yml diff --git a/tasks/FreeBSD-em0.yml b/tasks/FreeBSD-em0.yml new file mode 100644 index 0000000..db46c77 --- /dev/null +++ b/tasks/FreeBSD-em0.yml @@ -0,0 +1,22 @@ +--- +- name: install the updated intel driver + package: + name: intel-em-kmod + state: present + become: true + tags: + - installation + +- name: activate the updated intel driver + lineinfile: + path: "/boot/loader.conf" + regexp: "^{{ item.name }}" + line: "{{ item.name }}={{ item.val }}" + become: true + loop: "{{ sysctl_setting }}" + vars: + sysctl_setting: + - name: "if_em_updated_load" + val: 1 + tags: + - configuration diff --git a/tasks/main.yml b/tasks/main.yml index 5751595..32ef924 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -4,7 +4,7 @@ - vars - include_tasks: "{{ tweak }}" - when: "ansible_system == 'FreeBSD'" + when: ansible_facts['os_family'] == "FreeBSD" tags: - installation - configuration @@ -21,12 +21,13 @@ - FreeBSD-chromium.yml - FreeBSD-reader.yml - FreeBSD-shortcuts.yml + - FreeBSD-em0.yml - keyboard.yml - include_tasks: "{{ tweak }}" when: ansible_facts['os_family'] == "Debian" tags: - - installation + 0 - installation - configuration - vars loop_control: @@ -52,9 +53,7 @@ - configuration - vars loop_control: - loop_var: tweak + loop_var: tweaks loop: - "{{ role_path }}/../common/tasks/chip-development.yml" - "{{ role_path }}/../common/tasks/nmap.yml" - - From 8992bc8a686fab2201d0604bd09b47c5513f77bc Mon Sep 17 00:00:00 2001 From: 927589452 Date: Thu, 12 Sep 2019 21:33:41 +0200 Subject: [PATCH 7/7] syntax fix --- tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 32ef924..abd525b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -27,7 +27,7 @@ - include_tasks: "{{ tweak }}" when: ansible_facts['os_family'] == "Debian" tags: - 0 - installation + - installation - configuration - vars loop_control: