Skip to content
This repository has been archived by the owner on Jun 4, 2021. It is now read-only.

Don't print long apt keys to the log #1412

Merged
merged 3 commits into from Jul 30, 2018

Conversation

nopdotcom
Copy link
Member

This is mostly for the 200-line Tor key, but the other (25-line) keys were hidden for consistency.

This is mostly for the 200-line Tor key, but the other (25-line) keys were hidden for consistency.
@@ -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 }}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing no_log.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

What happened here was that I did a more extensive purge of with_file, given that with_foo loops have been deprecated in general. But on closer reading, with_file hasn't been deprecated, probably because it's cleaner-looking than:

- name: "Add the evil repository"
  apt_key:
    id: C0DEDBAD
    data: "{{ lookup('file', 'files/signing-key') }}"

So I backed off all of those patches, and went too far. Oops.

@@ -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 }}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing no_log.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

Copy link
Member

@jlund jlund left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@nopdotcom nopdotcom merged commit 2c11e75 into StreisandEffect:master Jul 30, 2018
@nopdotcom nopdotcom deleted the nopdotcom-shorter-log branch July 30, 2018 21:54
xiangwyao added a commit to xiangwyao/streisand that referenced this pull request Aug 12, 2018
* Make sure both gpg-agent and dirmngr have picked up new configuration (StreisandEffect#1387)

@hamidzr wrote StreisandEffect#1335, which fixes StreisandEffect#1333, a case of a running `gpg-agent` not picking up changes from GPG configuration. When testing, I noticed the configuration issue affects `dirmngr` as well. If there's a running `dirmngr`, provisioning fails when trying to update the keyring. This patch addresses both components.

`dirmngr` doesn't seem respond to HUP or `--reload`, so it needs to be killed and restarted.

Resolves StreisandEffect#1333.

* - mobileconfig re-generated from apple configurator 2 (StreisandEffect#1398)


    - .mobileconfig re-generated from Apple Configurator 2 (DeviceUniqueIdentifier key/value from VedorConfig and ProviderType packet-tunnel setting now removed)
    - uppercase UUIDs

* Remove "ec2:DescribeAlarms" from suggested IAM policy (StreisandEffect#1407)

"ec2:DescribeAlarms" doesn't exist.

* Updated Documentation for Ubuntu 16.04, 17.10, and 18.04 (StreisandEffect#1408)

There have been some issues with versions of Ubuntu. See Issue StreisandEffect#1296 for information about problems with 16.04. 16.10 and 17.04 are now end of life (see https://wiki.ubuntu.com/Releases). I have updated the documentation (minor changes) to reflect 16.04, 17.10, and 18.04, which are currently supported.

* Ensure VPN profile names fit in Linux network device names (StreisandEffect#1400)

There's a 15-character limit on the length of Linux network device names, and it would be nice to use the VPN profile names as interface names. A few of the wordlist words are 8 letters long. We can use two words as long as they're each 7 characters or shorter (leaving room for the separator).

* When checking syntax, don't search inside the venv directory (StreisandEffect#1395)

Now that we're telling people to use ./venv as a place to put virtualenvs, don't search there when we're checking syntax.

* Don't print long apt keys to the log (StreisandEffect#1412)

This is mostly for the 200-line Tor key, but the other (25-line) keys were hidden for consistency.

* Add WireGuard instructions for Android using the new QR code support. (StreisandEffect#1413)

* WireGuard instructions update (StreisandEffect#1417)

* Add WireGuard instructions for Android using the new QR code support.

* update wireguard fr instructions

* Update readme-fr (StreisandEffect#1419)

* Update OpenVPN instuctions (StreisandEffect#1420)

- update fr instructions to reflect changes made in StreisandEffect#1408
- correct instructions to mention LZ4 compression instead of LZO

* Fix stunnel windows mirror download location (StreisandEffect#1425)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants