Skip to content

Commit

Permalink
feat(firefox-de): install from Mozilla apt repository
Browse files Browse the repository at this point in the history
  • Loading branch information
smoyer64 committed Nov 1, 2024
1 parent 8791494 commit f109af8
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 126 deletions.
29 changes: 29 additions & 0 deletions roles/browser/tasks/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---

- name: "add the mozilla signing key"
apt_key:
url: "https://packages.mozilla.org/apt/repo-signing-key.gpg"
id: "35BAA0B33E9EB396F59CA838C0BA5CE6DC6315A3"
keyring: "{{ mozilla_apt_keyring }}"
tags:
- "mozilla"
- "browser"

- name: "add the mozilla apt repository"
apt_repository:
repo: "{{ item }}"
with_items:
- "deb [ signed-by={{ mozilla_apt_keyring }} ] https://packages.mozilla.org/apt mozilla main"
- "deb-src [ signed-by={{ mozilla_apt_keyring }} ] https://packages.mozilla.org/apt mozilla main"
tags:
- "mozilla"
- "browser"

- name: "add browsers of choice"
apt:
pkg:
- "chromium"
- "firefox-devedition"
- "lynx"
tags:
- "browser"
3 changes: 3 additions & 0 deletions roles/browser/vars/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---

mozilla_apt_keyring: "{{ apt_keyring_dir }}/mozilla-keyring.gpg"
64 changes: 0 additions & 64 deletions roles/firefox_de/tasks/main.yml

This file was deleted.

11 changes: 0 additions & 11 deletions roles/firefox_de/templates/firefox-de.desktop

This file was deleted.

23 changes: 0 additions & 23 deletions roles/firefox_de/vars/main.yml

This file was deleted.

2 changes: 1 addition & 1 deletion workstation.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash

export ANSIBLE_NOCOWS=1
ansible-playbook -K -i localhost, -e GITHUB_API_TOKEN=$GITHUB_API_TOKEN workstation.yml $*
54 changes: 27 additions & 27 deletions workstation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,17 @@
when: ansible_architecture == "i386"
become: yes
vars_files:
- config.yaml
- versions.yml
roles:
# - common
# - communication
# - development
- "common"
- "browser"
- "communication"
- "development"
# - containerization
# - networking
- iac
# - java
# - jmeter
# - java ***** ASDF by project *****
# - jmeter ***** ASDF by project *****
# - zaproxy
# - burp_suite
# - sqlmap
Expand All @@ -38,31 +39,30 @@
# - micro
# - pencil
# - postman
- ratpoison
- "ratpoison"
# - cloud
# - visual_studio
# - security

- hosts: localhost
connection: local
pre_tasks:
- name: Fail if Ansible version is too old
fail:
msg: "Workstation requires a minimum Ansible version of {{ ansible_minimum_version }}. Please update Ansible and run workstation.sh again."
when: ansible_version.full is version(ansible_minimum_version, operator='lt', strict=True)
- name: abort execution on 32-bit environments
fail:
msg: "These playbooks are now only available on 64-bit OSes"
when: ansible_architecture == "i386"
vars_files:
- local.yaml
- versions.yml
roles:
- local
- asdf
- firefox_de
# - hosts: localhost
# connection: local
# pre_tasks:
# - name: Fail if Ansible version is too old
# fail:
# msg: "Workstation requires a minimum Ansible version of {{ ansible_minimum_version }}. Please update Ansible and run workstation.sh again."
# when: ansible_version.full is version(ansible_minimum_version, operator='lt', strict=True)
# - name: abort execution on 32-bit environments
# fail:
# msg: "These playbooks are now only available on 64-bit OSes"
# when: ansible_architecture == "i386"
# vars_files:
# - local.yaml
# - versions.yml
# roles:
# - local
# - asdf
# - go
- codium
# - codium
# - krew
- kubenav
# - kubenav
# - freemind

0 comments on commit f109af8

Please sign in to comment.