Skip to content

Commit 026a33e

Browse files
committed
Replace var/task for gpg tools with role.
Not going to include this role in install_apps.yml. I don't use this anymore. It seems as though the devs aren't really keeping it up to date, either.
1 parent b4ed72d commit 026a33e

File tree

8 files changed

+52
-16
lines changed

8 files changed

+52
-16
lines changed

roles/gpg_tools/defaults/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
gpg_tools_version: "2023.3"
3+
gpg_tools_force_download: false
4+
gpg_tools_force_install: false
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
argument_specs:
3+
main:
4+
short_description: Install GPG Tools.
5+
description: >-
6+
Installs GPG Tools.
7+
options:
8+
gpg_tools_force_download:
9+
description: >-
10+
If True, download GPG Tools, even if it's already been downloaded.
11+
type: bool
12+
default: false
13+
gpg_tools_force_install:
14+
description: >-
15+
If True, install GPG Tools, even if it's already been installed.
16+
type: bool
17+
default: false
18+
gpg_tools_version:
19+
description: >-
20+
The version of GPG Tools to install.
21+
type: "str"

roles/gpg_tools/tasks/main.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Install gpg tools
2+
# https://gpgtools.org/
3+
#
4+
# I don't really see the need for gpg in 2025, and the developers of this haven't really been keeping it up to date
5+
# in any meaningful way, so...not sure how much more effort will go into this role.
6+
---
7+
- name: Download and install GPG Tools
8+
include_role:
9+
name: install_from_dmg
10+
vars:
11+
install_from_dmg_app_name: "GPG Keychain"
12+
install_from_dmg_image_url: "https://releases.gpgtools.org/GPG_Suite-{{ gpg_tools_version }}.dmg"
13+
install_from_dmg_image_destination: "{{ downloads }}/GPGTools.dmg"
14+
install_from_dmg_install_method: "Install.pkg"
15+
install_from_dmg_path_to_stat: "/usr/local/MacGPG2/bin/gpg"
16+
install_from_dmg_force_download: "{{ gpg_tools_force_download }}"
17+
install_from_dmg_force_install: "{{ gpg_tools_force_install }}"
18+
19+
# TODO configure Mail.app integration (optionally)

run-role-playbook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
- vars/fonts.yml
1111
- vars/launchd.yml
1212
- vars/mas.yml
13+
- vars/node.yml
1314
- vars/pip.yml
1415
- vars/ports.yml
15-
- vars/versions.yml
1616
tasks:
1717
- import_tasks: tasks/preliminaries.yml
1818

setup-playbook.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
- vars/fonts.yml
1010
- vars/launchd.yml
1111
- vars/mas.yml
12-
- vars/node_global_modules.yml
12+
- vars/node.yml
1313
- vars/pip.yml
1414
- vars/ports.yml
15-
- vars/versions.yml
1615
tasks:
1716
- name: Install python modules
1817
import_tasks: tasks/pip.yml

vars/dmgs.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,4 @@ dmgs_to_download_and_install:
1111
# dmg_url: https://www.dropbox.com/download?plat=mac
1212
# install_method: Dropbox.app
1313

14-
- app_name: GPG Keychain
15-
dmg_url: "https://releases.gpgtools.org/GPG_Suite-{{ gpgtools_version }}.dmg"
16-
install_method: Install.pkg
17-
path_to_stat: /usr/local/MacGPG2/bin/gpg
18-
1914
# TODO parallels?
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1+
# Node.js variables.
2+
---
3+
4+
# Version of node to install and make the default (via nvm)
5+
setup_node_version: "22.12.0"
6+
17
# Node modules to install globally.
28
#
39
# This variable must contain a list of items, each of which has a name and optional version. The module with the given
410
# name and version will be installed by the `node` role.
511
# name is required.
612
# version is optional. If omitted, the default is `latest`.
7-
---
813
setup_node_global_modules_to_install:
914
aws-cdk:
1015
aws-cdk-local:

vars/versions.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)