Merge pull request #4 from claranet/remove_banner

Remove banner reference
claranet · Jun 29, 2022 · 92cb5bf · 92cb5bf
2 parents dbf4d32 + 9770e5d
commit 92cb5bf
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 37 deletions.
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -30,8 +30,8 @@ jobs:
  config:
  - image: "amazonlinux"
  tag: "latest"
- - image: "centos"
- tag: "8"
+ - image: "fedora"
+ tag: "28"
  - image: "debian"
  tag: "11"
  - image: "debian"

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+###VSCode###
+.vscode
 ###MacOS###
 .DS_Store
 

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,9 +1,6 @@
 ---
 motd_disable_default_motd: true
-motd_banner_template: https://raw.githubusercontent.com/claranet/motd/master/banner
 motd_template: https://raw.githubusercontent.com/claranet/motd/master/scripts/00-basic
-motd_banner_template_prepend: ""
-motd_banner_template_append: ""
 motd_template_prepend: ""
 motd_template_append: |
 
@@ -13,5 +10,3 @@ motd_template_append: |
 
 motd_template_username: ""
 motd_template_password: ""
-motd_banner_template_username: "{{ motd_template_username }}"
-motd_banner_template_password: "{{ motd_template_password }}"
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -3,7 +3,6 @@
  hosts: all
  roles:
  - role: claranet.motd
- motd_banner_template: null
 
  pre_tasks:
  - name: "Update APT cache"

diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
@@ -12,11 +12,6 @@
 pam_line = f"session optional pam_exec.so type=open_session stdout {motd_file_path}"
 
 
-def test_banner_file(host):
- file = host.file("/etc/banner")
- assert not file.exists
-
-
 def test_motd_file(host):
  file = host.file(motd_file_path)
  assert file.exists

diff --git a/tasks/configure_banner.yml b/tasks/configure_banner.yml
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -1,6 +1,4 @@
 ---
-- include_tasks: configure_banner.yml
-
 - name: include_tasks disable_default_motd.yml if motd_disable_default_motd is True
  include_tasks: disable_default_motd.yml
  when: motd_disable_default_motd|bool

diff --git a/vars/main.yml b/vars/main.yml
@@ -2,10 +2,6 @@
 _motd_sshd_config_file_path: /etc/ssh/sshd_config
 _motd_pam_login_file_path: /etc/pam.d/login
 _motd_pam_sshd_file_path: /etc/pam.d/sshd
-_motd_banner_file_path: /etc/banner
-_motd_banner_state: "{{ 'present' if motd_banner_template else 'absent' }}"
 _motd_file_path: /usr/local/bin/dynmotd
 _motd_lookup_method: "{{ 'url' if motd_template is match('http(s)?:\/\/') else 'template' }}"
 _motd_template_content: "{{ lookup(_motd_lookup_method, motd_template, split_lines=False, username=motd_template_username, password=motd_template_password) }}"
-_motd_banner_lookup_method: "{{ 'url' if motd_banner_template is match('http(s)?:\/\/') else 'template' }}"
-_motd_banner_template_content: "{{ lookup(_motd_banner_lookup_method, motd_banner_template, split_lines=False, username=motd_banner_template_username, password=motd_banner_template_password) }}"