From 9fd8f2bc40a314e690425b7cdb76b172f21c0901 Mon Sep 17 00:00:00 2001 From: Jay Carlson Date: Sat, 28 Jul 2018 17:31:10 -0400 Subject: [PATCH 1/2] Don't print long apt keys to the log This is mostly for the 200-line Tor key, but the other (25-line) keys were hidden for consistency. --- playbooks/roles/lets-encrypt/tasks/install.yml | 2 +- playbooks/roles/nginx/tasks/main.yml | 2 +- playbooks/roles/openvpn/tasks/install.yml | 3 ++- playbooks/roles/tor-bridge/tasks/main.yml | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/playbooks/roles/lets-encrypt/tasks/install.yml b/playbooks/roles/lets-encrypt/tasks/install.yml index 4a2eab9a9..8c6439d77 100644 --- a/playbooks/roles/lets-encrypt/tasks/install.yml +++ b/playbooks/roles/lets-encrypt/tasks/install.yml @@ -1,4 +1,4 @@ -- name: Add the APT key for acmetool +- name: "Add the APT key for acmetool; hiding 25 lines of log..." apt_key: id: 9862409EF124EC763B84972FF5AC9651EDB58DFA data: "{{ item }}" diff --git a/playbooks/roles/nginx/tasks/main.yml b/playbooks/roles/nginx/tasks/main.yml index ec80a0a97..fbe42b130 100644 --- a/playbooks/roles/nginx/tasks/main.yml +++ b/playbooks/roles/nginx/tasks/main.yml @@ -5,7 +5,7 @@ state: absent with_items: "{{ apache_packages_to_remove }}" -- name: Add the official Nginx APT key +- name: "Add the official Nginx APT key; hiding 25 lines of log..." apt_key: id: 7BD9BF62 data: "{{ item }}" diff --git a/playbooks/roles/openvpn/tasks/install.yml b/playbooks/roles/openvpn/tasks/install.yml index 732ba49da..5030fa300 100644 --- a/playbooks/roles/openvpn/tasks/install.yml +++ b/playbooks/roles/openvpn/tasks/install.yml @@ -1,9 +1,10 @@ --- -- name: Add the official OpenVPN APT key +- name: "Add the official OpenVPN APT key; hiding 25 lines of log..." apt_key: id: E158C569 data: "{{ item }}" with_file: openvpn_signing.key + no_log: True - name: Add the official OpenVPN repository apt_repository: diff --git a/playbooks/roles/tor-bridge/tasks/main.yml b/playbooks/roles/tor-bridge/tasks/main.yml index c29729c5d..efe66a6bf 100644 --- a/playbooks/roles/tor-bridge/tasks/main.yml +++ b/playbooks/roles/tor-bridge/tasks/main.yml @@ -1,9 +1,10 @@ --- -- name: Add the Tor APT key +- name: "Add the Tor APT key; hiding 200 lines of log..." apt_key: id: 886DDD89 data: "{{ item }}" with_file: tor-signing.key + no_log: True - name: Add the Tor repository apt_repository: From 588e81ce334f598d5e460de80f2328ac442f18d9 Mon Sep 17 00:00:00 2001 From: Jay Carlson Date: Sun, 29 Jul 2018 16:43:21 -0400 Subject: [PATCH 2/2] Ah, the joys of bad merges --- playbooks/roles/lets-encrypt/tasks/install.yml | 1 + playbooks/roles/nginx/tasks/main.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/playbooks/roles/lets-encrypt/tasks/install.yml b/playbooks/roles/lets-encrypt/tasks/install.yml index 8c6439d77..2a8b8ec0a 100644 --- a/playbooks/roles/lets-encrypt/tasks/install.yml +++ b/playbooks/roles/lets-encrypt/tasks/install.yml @@ -3,6 +3,7 @@ id: 9862409EF124EC763B84972FF5AC9651EDB58DFA data: "{{ item }}" with_file: acmetool_ppa.pem + no_log: True - name: Add the official acmetool repository apt_repository: diff --git a/playbooks/roles/nginx/tasks/main.yml b/playbooks/roles/nginx/tasks/main.yml index fbe42b130..e3a1c2d07 100644 --- a/playbooks/roles/nginx/tasks/main.yml +++ b/playbooks/roles/nginx/tasks/main.yml @@ -10,6 +10,7 @@ id: 7BD9BF62 data: "{{ item }}" with_file: nginx_signing.key + no_log: True - name: Add the official Nginx repository apt_repository: