diff --git a/README.md b/README.md index fa7dd52..0689ba3 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,7 @@ sudo iscsiadm -m node -l # Mount at boot vim /etc/iscsi/nodes/iqn.2022-02.freenas.dnet:manjaro-backup/10.1.2.200,3260,1 + (/var/lib/iscsi/nodes/iqn.2022-02.freenas.dnet:manjaro-backup/10.1.2.200,3260,1/default) on fedora node.startup = automatic ``` diff --git a/arch/btrfs_backups/.travis.yml b/ansible/arch_certificates/.travis.yml similarity index 100% rename from arch/btrfs_backups/.travis.yml rename to ansible/arch_certificates/.travis.yml diff --git a/arch/btrfs_backups/README.md b/ansible/arch_certificates/README.md similarity index 100% rename from arch/btrfs_backups/README.md rename to ansible/arch_certificates/README.md diff --git a/arch/dnet_ca/defaults/main.yml b/ansible/arch_certificates/defaults/main.yml similarity index 100% rename from arch/dnet_ca/defaults/main.yml rename to ansible/arch_certificates/defaults/main.yml diff --git a/arch/dnet_ca/handlers/main.yml b/ansible/arch_certificates/handlers/main.yml similarity index 100% rename from arch/dnet_ca/handlers/main.yml rename to ansible/arch_certificates/handlers/main.yml diff --git a/arch/btrfs_backups/meta/main.yml b/ansible/arch_certificates/meta/main.yml similarity index 100% rename from arch/btrfs_backups/meta/main.yml rename to ansible/arch_certificates/meta/main.yml diff --git a/arch/dnet_ca/tasks/main.yml b/ansible/arch_certificates/tasks/main.yml similarity index 100% rename from arch/dnet_ca/tasks/main.yml rename to ansible/arch_certificates/tasks/main.yml diff --git a/arch/btrfs_backups/tests/inventory b/ansible/arch_certificates/tests/inventory similarity index 100% rename from arch/btrfs_backups/tests/inventory rename to ansible/arch_certificates/tests/inventory diff --git a/arch/dnet_ca/tests/test.yml b/ansible/arch_certificates/tests/test.yml similarity index 100% rename from arch/dnet_ca/tests/test.yml rename to ansible/arch_certificates/tests/test.yml diff --git a/arch/dnet_ca/vars/main.yml b/ansible/arch_certificates/vars/main.yml similarity index 100% rename from arch/dnet_ca/vars/main.yml rename to ansible/arch_certificates/vars/main.yml diff --git a/arch/daily_drivers/.travis.yml b/ansible/arch_daily_drivers/.travis.yml similarity index 100% rename from arch/daily_drivers/.travis.yml rename to ansible/arch_daily_drivers/.travis.yml diff --git a/arch/daily_drivers/README.md b/ansible/arch_daily_drivers/README.md similarity index 100% rename from arch/daily_drivers/README.md rename to ansible/arch_daily_drivers/README.md diff --git a/arch/daily_drivers/defaults/main.yml b/ansible/arch_daily_drivers/defaults/main.yml similarity index 100% rename from arch/daily_drivers/defaults/main.yml rename to ansible/arch_daily_drivers/defaults/main.yml diff --git a/arch/daily_drivers/handlers/main.yml b/ansible/arch_daily_drivers/handlers/main.yml similarity index 100% rename from arch/daily_drivers/handlers/main.yml rename to ansible/arch_daily_drivers/handlers/main.yml diff --git a/arch/daily_drivers/meta/main.yml b/ansible/arch_daily_drivers/meta/main.yml similarity index 100% rename from arch/daily_drivers/meta/main.yml rename to ansible/arch_daily_drivers/meta/main.yml diff --git a/arch/daily_drivers/tasks/main.yml b/ansible/arch_daily_drivers/tasks/main.yml similarity index 100% rename from arch/daily_drivers/tasks/main.yml rename to ansible/arch_daily_drivers/tasks/main.yml diff --git a/arch/daily_drivers/tests/inventory b/ansible/arch_daily_drivers/tests/inventory similarity index 100% rename from arch/daily_drivers/tests/inventory rename to ansible/arch_daily_drivers/tests/inventory diff --git a/arch/daily_drivers/tests/test.yml b/ansible/arch_daily_drivers/tests/test.yml similarity index 100% rename from arch/daily_drivers/tests/test.yml rename to ansible/arch_daily_drivers/tests/test.yml diff --git a/arch/daily_drivers/vars/main.yml b/ansible/arch_daily_drivers/vars/main.yml similarity index 100% rename from arch/daily_drivers/vars/main.yml rename to ansible/arch_daily_drivers/vars/main.yml diff --git a/arch/dconf/.travis.yml b/ansible/arch_developer_tools/.travis.yml similarity index 100% rename from arch/dconf/.travis.yml rename to ansible/arch_developer_tools/.travis.yml diff --git a/arch/dconf/README.md b/ansible/arch_developer_tools/README.md similarity index 100% rename from arch/dconf/README.md rename to ansible/arch_developer_tools/README.md diff --git a/arch/developer_tools/defaults/main.yml b/ansible/arch_developer_tools/defaults/main.yml similarity index 100% rename from arch/developer_tools/defaults/main.yml rename to ansible/arch_developer_tools/defaults/main.yml diff --git a/arch/developer_tools/handlers/main.yml b/ansible/arch_developer_tools/handlers/main.yml similarity index 100% rename from arch/developer_tools/handlers/main.yml rename to ansible/arch_developer_tools/handlers/main.yml diff --git a/arch/dconf/meta/main.yml b/ansible/arch_developer_tools/meta/main.yml similarity index 100% rename from arch/dconf/meta/main.yml rename to ansible/arch_developer_tools/meta/main.yml diff --git a/arch/developer_tools/tasks/main.yml b/ansible/arch_developer_tools/tasks/main.yml similarity index 98% rename from arch/developer_tools/tasks/main.yml rename to ansible/arch_developer_tools/tasks/main.yml index 748a036..18c8337 100644 --- a/arch/developer_tools/tasks/main.yml +++ b/ansible/arch_developer_tools/tasks/main.yml @@ -7,7 +7,7 @@ become: yes tags: update # Install Pacman developer tools -- name: Ensure daily-driver (development, work, gaming) installed +- name: Ensure common developer tools installed community.general.pacman: name: - vim @@ -28,6 +28,7 @@ - dconf-editor - yay - unzip + become: yes # Install yay developer tools - name: Install vscode command: yay -S visual-studio-code-bin --noconfirm diff --git a/arch/dconf/tests/inventory b/ansible/arch_developer_tools/tests/inventory similarity index 100% rename from arch/dconf/tests/inventory rename to ansible/arch_developer_tools/tests/inventory diff --git a/arch/developer_tools/tests/test.yml b/ansible/arch_developer_tools/tests/test.yml similarity index 100% rename from arch/developer_tools/tests/test.yml rename to ansible/arch_developer_tools/tests/test.yml diff --git a/ansible/arch_developer_tools/vars/main.yml b/ansible/arch_developer_tools/vars/main.yml new file mode 100644 index 0000000..d8754ec --- /dev/null +++ b/ansible/arch_developer_tools/vars/main.yml @@ -0,0 +1,5 @@ +--- +# vars file for arch/developer_tools +vault_version: 1.9.3 +tf_version: 1.1.5 +packer_version: 1.7.10 diff --git a/arch/developer_tools/.travis.yml b/ansible/arch_hardware_tools/.travis.yml similarity index 100% rename from arch/developer_tools/.travis.yml rename to ansible/arch_hardware_tools/.travis.yml diff --git a/arch/developer_tools/README.md b/ansible/arch_hardware_tools/README.md similarity index 100% rename from arch/developer_tools/README.md rename to ansible/arch_hardware_tools/README.md diff --git a/arch/hardware_tools/defaults/main.yml b/ansible/arch_hardware_tools/defaults/main.yml similarity index 100% rename from arch/hardware_tools/defaults/main.yml rename to ansible/arch_hardware_tools/defaults/main.yml diff --git a/arch/hardware_tools/handlers/main.yml b/ansible/arch_hardware_tools/handlers/main.yml similarity index 100% rename from arch/hardware_tools/handlers/main.yml rename to ansible/arch_hardware_tools/handlers/main.yml diff --git a/arch/developer_tools/meta/main.yml b/ansible/arch_hardware_tools/meta/main.yml similarity index 100% rename from arch/developer_tools/meta/main.yml rename to ansible/arch_hardware_tools/meta/main.yml diff --git a/arch/hardware_tools/tasks/main.yml b/ansible/arch_hardware_tools/tasks/main.yml similarity index 61% rename from arch/hardware_tools/tasks/main.yml rename to ansible/arch_hardware_tools/tasks/main.yml index 84fbf1d..26dcf02 100644 --- a/arch/hardware_tools/tasks/main.yml +++ b/ansible/arch_hardware_tools/tasks/main.yml @@ -6,45 +6,38 @@ upgrade: yes become: yes tags: update -# Bluetooth -- name: Ensure bluetooth installed and configured +# Pacman hardware controllers +- name: Ensure common hardware controllers installed via Pacman community.general.pacman: name: - bluez - bluez-utils + - ufw + - intel-media-driver + - intel-gpu-tools + - tlp state: present become: yes +# TLP +- name: Create tlp.conf file + copy: + dest: "/etc/tlp.conf" + content: | + PCIE_ASPM_ON_BAT=powersupersave + become: yes +- name: Ensure tlp service enabled and running + ansible.builtin.systemd: + name: tlp + state: started + enabled: yes + become: yes +# Bluetooth - name: Ensure bluetooth service started ansible.builtin.systemd: name: bluetooth state: started enabled: yes become: yes -# Auto CPU Freq -- name: Ensure snap installed - community.general.pacman: - name: snapd - state: present - become: yes -- name: Ensure snapd service running - ansible.builtin.systemd: - name: snapd.socket - state: started - enabled: yes - become: yes -- name: Uninstall tlp - community.general.pacman: - name: tlp - state: absent - become: yes -- name: Install auto-cpufreq - community.general.snap: - name: auto-cpufreq - state: present - become: yes -- name: Enable auto-cpufreq - command: auto-cpufreq --install - become: yes # UFW - name: Ensure UFW installed community.general.pacman: diff --git a/arch/developer_tools/tests/inventory b/ansible/arch_hardware_tools/tests/inventory similarity index 100% rename from arch/developer_tools/tests/inventory rename to ansible/arch_hardware_tools/tests/inventory diff --git a/arch/hardware_tools/tests/test.yml b/ansible/arch_hardware_tools/tests/test.yml similarity index 100% rename from arch/hardware_tools/tests/test.yml rename to ansible/arch_hardware_tools/tests/test.yml diff --git a/arch/hardware_tools/vars/main.yml b/ansible/arch_hardware_tools/vars/main.yml similarity index 100% rename from arch/hardware_tools/vars/main.yml rename to ansible/arch_hardware_tools/vars/main.yml diff --git a/arch/backtop.yml b/ansible/backtop.yml similarity index 90% rename from arch/backtop.yml rename to ansible/backtop.yml index 953fb95..17baeed 100644 --- a/arch/backtop.yml +++ b/ansible/backtop.yml @@ -1,34 +1,34 @@ --- # Run through all tasks to setup machines -- hosts: localhost +- hosts: backtop gather_facts: true order: inventory vars: executable_temp_dir: /tmp awscli_install_dir: /opt/aws-cli/ vault_version: 1.9.3 - swap_file_path: /swap/swapfile + swap_file_path: /swapfile swap_file_size_mb: 8192 roles: - - role: dconf - tags: ["dconf"] + - role: swap + tags: ["swap"] + + - role: hardware_tools + tags: ["hardware_tools"] - role: developer_tools tags: ["developer_tools"] - - role: dnet_ca - tags: ["dnet_ca"] - - - role: hardware_tools - tags: ["hardware_tools"] - - role: iscsi_freenas tags: ["iscsi_freenas"] + - role: dconf + tags: ["dconf"] + + - role: dnet_ca + tags: ["dnet_ca"] + - role: openssh tags: ["openssh"] - - - role: swap - tags: ["swap"] diff --git a/arch/dnet_ca/.travis.yml b/ansible/btrfs_backups/.travis.yml similarity index 100% rename from arch/dnet_ca/.travis.yml rename to ansible/btrfs_backups/.travis.yml diff --git a/ansible/btrfs_backups/README.md b/ansible/btrfs_backups/README.md new file mode 100644 index 0000000..815af52 --- /dev/null +++ b/ansible/btrfs_backups/README.md @@ -0,0 +1,57 @@ +Role Name +========= + +Configures automatic BTRFS backups for "/" and "/home" + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +```yaml +snapshots: + path: /.snapshots + +disk: + name: backup0 + # uuid: 1d7ce570-e695-47a0-9dda-5f14b5b20e21 + uuid: 7c482f9b-2e1a-494c-9a93-ddecd483f2b2 + # password: /home/ducoterra/.lukskeys/backup0 + password: /home/ducoterra/.lukskeys/manjaro-laptop-iscsi + +backups: + - / + - /home + +notifications: + user: + name: ducoterra + uid: 1000 +``` + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/arch/btrfs_backups/defaults/main.yml b/ansible/btrfs_backups/defaults/main.yml similarity index 100% rename from arch/btrfs_backups/defaults/main.yml rename to ansible/btrfs_backups/defaults/main.yml diff --git a/arch/btrfs_backups/handlers/main.yml b/ansible/btrfs_backups/handlers/main.yml similarity index 100% rename from arch/btrfs_backups/handlers/main.yml rename to ansible/btrfs_backups/handlers/main.yml diff --git a/arch/dnet_ca/meta/main.yml b/ansible/btrfs_backups/meta/main.yml similarity index 100% rename from arch/dnet_ca/meta/main.yml rename to ansible/btrfs_backups/meta/main.yml diff --git a/arch/btrfs_backups/tasks/main.yml b/ansible/btrfs_backups/tasks/main.yml similarity index 100% rename from arch/btrfs_backups/tasks/main.yml rename to ansible/btrfs_backups/tasks/main.yml diff --git a/arch/btrfs_backups/templates/btrfs_backup.sh.j2 b/ansible/btrfs_backups/templates/btrfs_backup.sh.j2 similarity index 100% rename from arch/btrfs_backups/templates/btrfs_backup.sh.j2 rename to ansible/btrfs_backups/templates/btrfs_backup.sh.j2 diff --git a/arch/btrfs_backups/templates/open_backup.sh.j2 b/ansible/btrfs_backups/templates/open_backup.sh.j2 similarity index 100% rename from arch/btrfs_backups/templates/open_backup.sh.j2 rename to ansible/btrfs_backups/templates/open_backup.sh.j2 diff --git a/arch/dnet_ca/tests/inventory b/ansible/btrfs_backups/tests/inventory similarity index 100% rename from arch/dnet_ca/tests/inventory rename to ansible/btrfs_backups/tests/inventory diff --git a/arch/btrfs_backups/tests/test.yml b/ansible/btrfs_backups/tests/test.yml similarity index 100% rename from arch/btrfs_backups/tests/test.yml rename to ansible/btrfs_backups/tests/test.yml diff --git a/ansible/btrfs_backups/vars/main.yml b/ansible/btrfs_backups/vars/main.yml new file mode 100644 index 0000000..ed97d53 --- /dev/null +++ b/ansible/btrfs_backups/vars/main.yml @@ -0,0 +1 @@ +--- diff --git a/arch/gnome_extensions/.travis.yml b/ansible/dconf/.travis.yml similarity index 100% rename from arch/gnome_extensions/.travis.yml rename to ansible/dconf/.travis.yml diff --git a/arch/dnet_ca/README.md b/ansible/dconf/README.md similarity index 100% rename from arch/dnet_ca/README.md rename to ansible/dconf/README.md diff --git a/arch/dconf/defaults/main.yml b/ansible/dconf/defaults/main.yml similarity index 100% rename from arch/dconf/defaults/main.yml rename to ansible/dconf/defaults/main.yml diff --git a/arch/dconf/handlers/main.yml b/ansible/dconf/handlers/main.yml similarity index 100% rename from arch/dconf/handlers/main.yml rename to ansible/dconf/handlers/main.yml diff --git a/arch/gnome_extensions/meta/main.yml b/ansible/dconf/meta/main.yml similarity index 100% rename from arch/gnome_extensions/meta/main.yml rename to ansible/dconf/meta/main.yml diff --git a/arch/dconf/tasks/main.yml b/ansible/dconf/tasks/main.yml similarity index 92% rename from arch/dconf/tasks/main.yml rename to ansible/dconf/tasks/main.yml index db8c1ca..7a786e3 100644 --- a/arch/dconf/tasks/main.yml +++ b/ansible/dconf/tasks/main.yml @@ -17,4 +17,4 @@ - name: Don't auto open mounted drives command: dconf write /org/gnome/desktop/media-handling/automount-open false - name: Emulate right-click with two fingers - command: dconf write org/gnome/desktop/peripherals/touchpad/click-method "'fingers'" + command: dconf write /org/gnome/desktop/peripherals/touchpad/click-method "'fingers'" diff --git a/arch/gnome_extensions/tests/inventory b/ansible/dconf/tests/inventory similarity index 100% rename from arch/gnome_extensions/tests/inventory rename to ansible/dconf/tests/inventory diff --git a/arch/dconf/tests/test.yml b/ansible/dconf/tests/test.yml similarity index 100% rename from arch/dconf/tests/test.yml rename to ansible/dconf/tests/test.yml diff --git a/arch/dconf/vars/main.yml b/ansible/dconf/vars/main.yml similarity index 100% rename from arch/dconf/vars/main.yml rename to ansible/dconf/vars/main.yml diff --git a/arch/hardware_tools/.travis.yml b/ansible/fedora_certificates/.travis.yml similarity index 100% rename from arch/hardware_tools/.travis.yml rename to ansible/fedora_certificates/.travis.yml diff --git a/arch/gnome_extensions/README.md b/ansible/fedora_certificates/README.md similarity index 100% rename from arch/gnome_extensions/README.md rename to ansible/fedora_certificates/README.md diff --git a/ansible/fedora_certificates/defaults/main.yml b/ansible/fedora_certificates/defaults/main.yml new file mode 100644 index 0000000..9b865bc --- /dev/null +++ b/ansible/fedora_certificates/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for ansible/fedora_certificates diff --git a/ansible/fedora_certificates/handlers/main.yml b/ansible/fedora_certificates/handlers/main.yml new file mode 100644 index 0000000..92f26a1 --- /dev/null +++ b/ansible/fedora_certificates/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for ansible/fedora_certificates diff --git a/arch/hardware_tools/meta/main.yml b/ansible/fedora_certificates/meta/main.yml similarity index 100% rename from arch/hardware_tools/meta/main.yml rename to ansible/fedora_certificates/meta/main.yml diff --git a/ansible/fedora_certificates/tasks/main.yml b/ansible/fedora_certificates/tasks/main.yml new file mode 100644 index 0000000..5b70fcd --- /dev/null +++ b/ansible/fedora_certificates/tasks/main.yml @@ -0,0 +1,11 @@ +--- +# Install DNET CA +- name: Download DNET CA + get_url: + url: https://vault.ducoterra.net/v1/dnet/ca + dest: /etc/pki/ca-trust/source/anchors/dnet_ca.crt + mode: '0660' + become: yes +- name: Update trust store + command: update-ca-trust + become: yes diff --git a/arch/hardware_tools/tests/inventory b/ansible/fedora_certificates/tests/inventory similarity index 100% rename from arch/hardware_tools/tests/inventory rename to ansible/fedora_certificates/tests/inventory diff --git a/ansible/fedora_certificates/tests/test.yml b/ansible/fedora_certificates/tests/test.yml new file mode 100644 index 0000000..29dd776 --- /dev/null +++ b/ansible/fedora_certificates/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - ansible/fedora_certificates diff --git a/ansible/fedora_certificates/vars/main.yml b/ansible/fedora_certificates/vars/main.yml new file mode 100644 index 0000000..5b3bf0f --- /dev/null +++ b/ansible/fedora_certificates/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for ansible/fedora_certificates diff --git a/arch/iscsi_freenas/.travis.yml b/ansible/fedora_daily_drivers/.travis.yml similarity index 100% rename from arch/iscsi_freenas/.travis.yml rename to ansible/fedora_daily_drivers/.travis.yml diff --git a/arch/hardware_tools/README.md b/ansible/fedora_daily_drivers/README.md similarity index 100% rename from arch/hardware_tools/README.md rename to ansible/fedora_daily_drivers/README.md diff --git a/ansible/fedora_daily_drivers/defaults/main.yml b/ansible/fedora_daily_drivers/defaults/main.yml new file mode 100644 index 0000000..2e97c08 --- /dev/null +++ b/ansible/fedora_daily_drivers/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for arch/daily_drivers diff --git a/ansible/fedora_daily_drivers/handlers/main.yml b/ansible/fedora_daily_drivers/handlers/main.yml new file mode 100644 index 0000000..e584df3 --- /dev/null +++ b/ansible/fedora_daily_drivers/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for arch/daily_drivers diff --git a/arch/iscsi_freenas/meta/main.yml b/ansible/fedora_daily_drivers/meta/main.yml similarity index 100% rename from arch/iscsi_freenas/meta/main.yml rename to ansible/fedora_daily_drivers/meta/main.yml diff --git a/ansible/fedora_daily_drivers/tasks/main.yml b/ansible/fedora_daily_drivers/tasks/main.yml new file mode 100644 index 0000000..7c5b214 --- /dev/null +++ b/ansible/fedora_daily_drivers/tasks/main.yml @@ -0,0 +1,75 @@ +--- +# Install dnf daily drivers +- name: Ensure daily-driver (development, work, gaming) installed + dnf: + name: + - remmina + - freerdp + - chromium + - steam + - geary + - make + - seahorse # gnome keyring manager + - gimp + - libreoffice + state: present + become: yes +# Install snap-based daily-drivers +- name: Ensure snap installed + dnf: + name: snapd + state: present + become: yes +- name: Ensure snapd service running + ansible.builtin.systemd: + name: snapd.socket + state: started + enabled: yes + become: yes +- name: Link /var/lib/snapd/snap /snap + ansible.builtin.file: + src: /var/lib/snapd/snap + dest: /snap + owner: root + group: root + state: link + become: yes +- name: Install snap packages + community.general.snap: + name: + - snap-store + - spotify + - discord + state: present + become: yes + retries: 6 + delay: 10 +# QMK +- name: Install qmk + pip: + name: qmk + extra_args: --user +- name: Run qmk setup + ansible.builtin.command: qmk setup -y + become: yes +- name: Copy qmk udev rules + ansible.builtin.copy: + src: ~/qmk_firmware/util/udev/50-qmk.rules + dest: /etc/udev/rules.d/50-qmk.rules + owner: ducoterra + group: root + mode: '0755' + become: yes +# VLC +- name: Add VLC free repo + command: dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm + become: yes +- name: Add VLC nonfree repo + command: dnf install https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm + become: yes +- name: Install VLC + dnf: + name: + - vlc + state: present + become: yes diff --git a/arch/iscsi_freenas/tests/inventory b/ansible/fedora_daily_drivers/tests/inventory similarity index 100% rename from arch/iscsi_freenas/tests/inventory rename to ansible/fedora_daily_drivers/tests/inventory diff --git a/ansible/fedora_daily_drivers/tests/test.yml b/ansible/fedora_daily_drivers/tests/test.yml new file mode 100644 index 0000000..908e523 --- /dev/null +++ b/ansible/fedora_daily_drivers/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - arch/daily_drivers diff --git a/ansible/fedora_daily_drivers/vars/main.yml b/ansible/fedora_daily_drivers/vars/main.yml new file mode 100644 index 0000000..de38423 --- /dev/null +++ b/ansible/fedora_daily_drivers/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for arch/daily_drivers diff --git a/arch/minecraft/.travis.yml b/ansible/fedora_developer_tools/.travis.yml similarity index 100% rename from arch/minecraft/.travis.yml rename to ansible/fedora_developer_tools/.travis.yml diff --git a/arch/iscsi_freenas/README.md b/ansible/fedora_developer_tools/README.md similarity index 100% rename from arch/iscsi_freenas/README.md rename to ansible/fedora_developer_tools/README.md diff --git a/ansible/fedora_developer_tools/defaults/main.yml b/ansible/fedora_developer_tools/defaults/main.yml new file mode 100644 index 0000000..06ab757 --- /dev/null +++ b/ansible/fedora_developer_tools/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for arch/developer_tools diff --git a/ansible/fedora_developer_tools/handlers/main.yml b/ansible/fedora_developer_tools/handlers/main.yml new file mode 100644 index 0000000..98370b2 --- /dev/null +++ b/ansible/fedora_developer_tools/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for arch/developer_tools diff --git a/arch/minecraft/meta/main.yml b/ansible/fedora_developer_tools/meta/main.yml similarity index 100% rename from arch/minecraft/meta/main.yml rename to ansible/fedora_developer_tools/meta/main.yml diff --git a/ansible/fedora_developer_tools/tasks/main.yml b/ansible/fedora_developer_tools/tasks/main.yml new file mode 100644 index 0000000..ef593d6 --- /dev/null +++ b/ansible/fedora_developer_tools/tasks/main.yml @@ -0,0 +1,181 @@ +--- +# Install developer tools +- name: Ensure common developer tools installed + dnf: + name: + - vim-enhanced + - iperf3 + - python3-pip + - glances + - htop + - dconf-editor + - dnf-plugins-core + become: yes +# Install VSCode +- name: Add vscode RPM repo + copy: + dest: "/etc/yum.repos.d/vscode.repo" + content: | + [vscode] + name=Visual Studio Code + baseurl=https://packages.microsoft.com/yumrepos/vscode + enabled=1 + gpgcheck=1 + gpgkey=https://packages.microsoft.com/keys/microsoft.asc + become: yes +- name: Import microsoft RPM key + command: rpm --import https://packages.microsoft.com/keys/microsoft.asc + become: yes +- name: Ensure VSCode installed + dnf: + name: + - code + become: yes +# Install snap developer tools +- name: Ensure snap installed + dnf: + name: snapd + state: present + become: yes +- name: Link /var/lib/snapd/snap /snap + ansible.builtin.file: + src: /var/lib/snapd/snap + dest: /snap + owner: root + group: root + state: link + become: yes +- name: Ensure snapd service running + ansible.builtin.systemd: + name: snapd.socket + state: started + enabled: yes + become: yes +- name: Install snap packages + community.general.snap: + name: + - yq + state: present + become: yes +- name: Install classic snap packages + community.general.snap: + name: + - kubectl + - helm + state: present + classic: yes + become: yes +# AWS CLI +- name: Download awscli v2 installer - latest version + unarchive: + src: https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip + dest: '{{ executable_temp_dir }}' + remote_src: true + creates: '{{ executable_temp_dir }}/aws' + mode: 0755 + when: awscli_version is not defined + tags: ["awscli", "awscliv2"] +- name: Download awscli v2 installer - specific version {{ awscli_version }} + unarchive: + src: 'https://awscli.amazonaws.com/awscli-exe-linux-x86_64-{{ awscli_version }}.zip' + dest: "{{ executable_temp_dir }}" + remote_src: true + creates: '{{ executable_temp_dir }}/aws' + mode: 0755 + when: awscli_version is defined + tags: ["awscli", "awscliv2"] +- name: Run the installer for awscli v2 + command: + args: + cmd: '{{ executable_temp_dir }}/aws/install -i {{ awscli_install_dir }} -b /usr/local/bin' + creates: /usr/local/bin/aws + become: yes + tags: ["awscli", "awscliv2"] +# Ansible +- name: Install ansible + pip: + name: ansible + extra_args: --user +# Docker +- name: Add Docker dnf repo + command: dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo + become: yes +- name: Ensure Docker installed + dnf: + name: + - docker-ce + - docker-ce-cli + - containerd.io + state: present + become: yes +- name: Ensure ducoterra in the "docker" group + ansible.builtin.user: + name: ducoterra + groups: docker + append: yes + become: yes +# Vault CLI +- name: Download vault binary + unarchive: + src: https://releases.hashicorp.com/vault/{{vault_version}}/vault_{{vault_version}}_linux_amd64.zip + dest: '{{ executable_temp_dir }}' + remote_src: true + creates: '{{ executable_temp_dir }}/vault' + mode: 0755 + become: yes +- name: Move vault binary to /usr/local/bin + ansible.builtin.copy: + remote_src: yes + src: '{{ executable_temp_dir }}/vault' + dest: /usr/local/bin/vault + owner: root + group: root + mode: '0755' + become: yes +# Terraform CLI +- name: Download vault binary + unarchive: + src: https://releases.hashicorp.com/terraform/{{tf_version}}/terraform_{{tf_version}}_linux_amd64.zip + dest: '{{ executable_temp_dir }}' + remote_src: true + creates: '{{ executable_temp_dir }}/terraform' + mode: 0755 + become: yes +- name: Move terraform binary to /usr/local/bin + ansible.builtin.copy: + remote_src: yes + src: '{{ executable_temp_dir }}/terraform' + dest: /usr/local/bin/terraform + owner: root + group: root + mode: '0755' + become: yes +# Packer CLI +- name: Download packer binary + unarchive: + src: https://releases.hashicorp.com/packer/{{packer_version}}/packer_{{packer_version}}_linux_amd64.zip + dest: '{{ executable_temp_dir }}' + remote_src: true + creates: '{{ executable_temp_dir }}/packer' + mode: 0755 + become: yes +- name: Move packer binary to /usr/local/bin + ansible.builtin.copy: + remote_src: yes + src: '{{ executable_temp_dir }}/packer' + dest: /usr/local/bin/packer + owner: root + group: root + mode: '0755' + become: yes +# Wireguard Configuration +- name: Ensure wireguard-tools installed + dnf: + name: wireguard-tools + state: present + become: yes +- name: Ensure /etc/wireguard directory + file: + path: /etc/wireguard + state: directory + become: yes diff --git a/arch/minecraft/tests/inventory b/ansible/fedora_developer_tools/tests/inventory similarity index 100% rename from arch/minecraft/tests/inventory rename to ansible/fedora_developer_tools/tests/inventory diff --git a/ansible/fedora_developer_tools/tests/test.yml b/ansible/fedora_developer_tools/tests/test.yml new file mode 100644 index 0000000..5d4a47c --- /dev/null +++ b/ansible/fedora_developer_tools/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - arch/developer_tools diff --git a/ansible/fedora_developer_tools/vars/main.yml b/ansible/fedora_developer_tools/vars/main.yml new file mode 100644 index 0000000..d8754ec --- /dev/null +++ b/ansible/fedora_developer_tools/vars/main.yml @@ -0,0 +1,5 @@ +--- +# vars file for arch/developer_tools +vault_version: 1.9.3 +tf_version: 1.1.5 +packer_version: 1.7.10 diff --git a/arch/openssh/.travis.yml b/ansible/fedora_hardware_tools/.travis.yml similarity index 100% rename from arch/openssh/.travis.yml rename to ansible/fedora_hardware_tools/.travis.yml diff --git a/arch/minecraft/README.md b/ansible/fedora_hardware_tools/README.md similarity index 100% rename from arch/minecraft/README.md rename to ansible/fedora_hardware_tools/README.md diff --git a/ansible/fedora_hardware_tools/defaults/main.yml b/ansible/fedora_hardware_tools/defaults/main.yml new file mode 100644 index 0000000..1d0dc05 --- /dev/null +++ b/ansible/fedora_hardware_tools/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for arch/hardware_tools diff --git a/ansible/fedora_hardware_tools/handlers/main.yml b/ansible/fedora_hardware_tools/handlers/main.yml new file mode 100644 index 0000000..a7701c6 --- /dev/null +++ b/ansible/fedora_hardware_tools/handlers/main.yml @@ -0,0 +1,2 @@ +--- +# handlers file for arch/hardware_tools diff --git a/arch/openssh/meta/main.yml b/ansible/fedora_hardware_tools/meta/main.yml similarity index 100% rename from arch/openssh/meta/main.yml rename to ansible/fedora_hardware_tools/meta/main.yml diff --git a/ansible/fedora_hardware_tools/tasks/main.yml b/ansible/fedora_hardware_tools/tasks/main.yml new file mode 100644 index 0000000..5190066 --- /dev/null +++ b/ansible/fedora_hardware_tools/tasks/main.yml @@ -0,0 +1,38 @@ +--- +- name: Ensure hardware-controlling software installed + dnf: + name: + - ufw + - tlp + state: present + become: yes +# TLP +- name: Create tlp.conf file + copy: + dest: "/etc/tlp.conf" + content: | + PCIE_ASPM_ON_BAT=powersupersave + become: yes +- name: Ensure tlp service enabled and running + ansible.builtin.systemd: + name: tlp + state: started + enabled: yes + become: yes +# Mic headphone jack +- name: Ensure microphone works plugged into headphone jack + copy: + dest: "/etc/modprobe.d/alsa-base.conf" + content: | + options snd-hda-intel model=dell-headset-multi + become: yes +# UFW +- name: Allow SSH + community.general.ufw: + rule: allow + name: ssh + become: yes +- name: Enable UFW + community.general.ufw: + state: enabled + become: yes diff --git a/arch/openssh/tests/inventory b/ansible/fedora_hardware_tools/tests/inventory similarity index 100% rename from arch/openssh/tests/inventory rename to ansible/fedora_hardware_tools/tests/inventory diff --git a/ansible/fedora_hardware_tools/tests/test.yml b/ansible/fedora_hardware_tools/tests/test.yml new file mode 100644 index 0000000..a72c069 --- /dev/null +++ b/ansible/fedora_hardware_tools/tests/test.yml @@ -0,0 +1,5 @@ +--- +- hosts: localhost + remote_user: root + roles: + - arch/hardware_tools diff --git a/ansible/fedora_hardware_tools/vars/main.yml b/ansible/fedora_hardware_tools/vars/main.yml new file mode 100644 index 0000000..d3a7d63 --- /dev/null +++ b/ansible/fedora_hardware_tools/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for arch/hardware_tools diff --git a/ansible/framework_fedora.yml b/ansible/framework_fedora.yml new file mode 100644 index 0000000..e037d2b --- /dev/null +++ b/ansible/framework_fedora.yml @@ -0,0 +1,60 @@ +--- +# Run through all tasks to setup machines +# https://community.frame.work/t/fedora-linux-35-on-the-framework-laptop/6613/10 +- hosts: localhost + gather_facts: true + order: inventory + vars: + executable_temp_dir: /tmp + awscli_install_dir: /opt/aws-cli/ + swap_file_path: /swap/swapfile + swap_file_size_mb: 0 + vault_version: 1.9.3 + tf_version: 1.1.5 + packer_version: 1.7.10 + # btrfs_backup + snapshots: + path: /.snapshots + disk: + name: backup0 + uuid: 7c482f9b-2e1a-494c-9a93-ddecd483f2b2 + password: /home/ducoterra/.lukskeys/fedora-laptop-iscsi + backups: + - / + - /home + notifications: + user: + name: ducoterra + uid: 1000 + + roles: + + - role: swap + tags: ["swap"] + + - role: openssh + tags: ["openssh"] + + - role: fedora_certificates + tags: ["certificates"] + + - role: fedora_hardware_tools + tags: ["hardware_tools"] + + - role: fedora_developer_tools + tags: ["developer_tools"] + + - role: fedora_daily_drivers + tags: ["daily_drivers"] + + - role: iscsi_freenas + tags: ["iscsi_freenas"] + + - role: dconf + tags: ["dconf"] + + - role: gnome_extensions + tags: ["gnome_extensions"] + + - role: btrfs_backups + tags: ["btrfs_backups"] diff --git a/arch/framework.yml b/ansible/framework_manjaro.yml similarity index 64% rename from arch/framework.yml rename to ansible/framework_manjaro.yml index 81bcc88..b874e07 100644 --- a/arch/framework.yml +++ b/ansible/framework_manjaro.yml @@ -7,43 +7,63 @@ vars: executable_temp_dir: /tmp awscli_install_dir: /opt/aws-cli/ - vault_version: 1.9.3 swap_file_path: /swap/swapfile - swap_file_size_mb: 4096 + swap_file_size_mb: 0 + vault_version: 1.9.3 + tf_version: 1.1.5 + packer_version: 1.7.10 + + # btrfs_backup + snapshots: + path: /.snapshots + disk: + name: backup0 + # uuid: 1d7ce570-e695-47a0-9dda-5f14b5b20e21 + uuid: 7c482f9b-2e1a-494c-9a93-ddecd483f2b2 + # password: /home/ducoterra/.lukskeys/backup0 + password: /home/ducoterra/.lukskeys/manjaro-laptop-iscsi + backups: + - / + - /home + notifications: + user: + name: ducoterra + uid: 1000 roles: - - role: btrfs_backups - tags: ["btrfs_backups"] - - - role: daily_drivers - tags: ["daily_drivers"] - - - role: dconf - tags: ["dconf"] - - - role: developer_tools - tags: ["developer_tools"] - - - role: dnet_ca - tags: ["dnet_ca"] - - - role: gnome_extensions - tags: ["gnome_extensions"] - - - role: hardware_tools - tags: ["hardware_tools"] - - - role: iscsi_freenas - tags: ["iscsi_freenas"] - - - role: minecraft - tags: ["minecraft"] - - - role: openssh - tags: ["openssh"] - role: swap tags: ["swap"] + - role: openssh + tags: ["openssh"] + + - role: dnet_ca + tags: ["dnet_ca"] + + - role: hardware_tools + tags: ["hardware_tools"] + + - role: developer_tools + tags: ["developer_tools"] + + - role: daily_drivers + tags: ["daily_drivers"] + - role: work_tools tags: ["work_tools"] + + - role: iscsi_freenas + tags: ["iscsi_freenas"] + + - role: dconf + tags: ["dconf"] + + - role: gnome_extensions + tags: ["gnome_extensions"] + + - role: minecraft + tags: ["minecraft"] + + - role: btrfs_backups + tags: ["btrfs_backups"] diff --git a/arch/swap/.travis.yml b/ansible/gnome_extensions/.travis.yml similarity index 100% rename from arch/swap/.travis.yml rename to ansible/gnome_extensions/.travis.yml diff --git a/arch/openssh/README.md b/ansible/gnome_extensions/README.md similarity index 100% rename from arch/openssh/README.md rename to ansible/gnome_extensions/README.md diff --git a/arch/gnome_extensions/defaults/main.yml b/ansible/gnome_extensions/defaults/main.yml similarity index 100% rename from arch/gnome_extensions/defaults/main.yml rename to ansible/gnome_extensions/defaults/main.yml diff --git a/arch/gnome_extensions/handlers/main.yml b/ansible/gnome_extensions/handlers/main.yml similarity index 100% rename from arch/gnome_extensions/handlers/main.yml rename to ansible/gnome_extensions/handlers/main.yml diff --git a/arch/swap/meta/main.yml b/ansible/gnome_extensions/meta/main.yml similarity index 100% rename from arch/swap/meta/main.yml rename to ansible/gnome_extensions/meta/main.yml diff --git a/arch/gnome_extensions/tasks/main.yml b/ansible/gnome_extensions/tasks/main.yml similarity index 100% rename from arch/gnome_extensions/tasks/main.yml rename to ansible/gnome_extensions/tasks/main.yml diff --git a/arch/swap/tests/inventory b/ansible/gnome_extensions/tests/inventory similarity index 100% rename from arch/swap/tests/inventory rename to ansible/gnome_extensions/tests/inventory diff --git a/arch/gnome_extensions/tests/test.yml b/ansible/gnome_extensions/tests/test.yml similarity index 100% rename from arch/gnome_extensions/tests/test.yml rename to ansible/gnome_extensions/tests/test.yml diff --git a/arch/gnome_extensions/vars/main.yml b/ansible/gnome_extensions/vars/main.yml similarity index 100% rename from arch/gnome_extensions/vars/main.yml rename to ansible/gnome_extensions/vars/main.yml diff --git a/arch/work_tools/.travis.yml b/ansible/iscsi_freenas/.travis.yml similarity index 100% rename from arch/work_tools/.travis.yml rename to ansible/iscsi_freenas/.travis.yml diff --git a/arch/swap/README.md b/ansible/iscsi_freenas/README.md similarity index 100% rename from arch/swap/README.md rename to ansible/iscsi_freenas/README.md diff --git a/arch/iscsi_freenas/defaults/main.yml b/ansible/iscsi_freenas/defaults/main.yml similarity index 100% rename from arch/iscsi_freenas/defaults/main.yml rename to ansible/iscsi_freenas/defaults/main.yml diff --git a/arch/iscsi_freenas/handlers/main.yml b/ansible/iscsi_freenas/handlers/main.yml similarity index 100% rename from arch/iscsi_freenas/handlers/main.yml rename to ansible/iscsi_freenas/handlers/main.yml diff --git a/arch/work_tools/meta/main.yml b/ansible/iscsi_freenas/meta/main.yml similarity index 100% rename from arch/work_tools/meta/main.yml rename to ansible/iscsi_freenas/meta/main.yml diff --git a/arch/iscsi_freenas/tasks/main.yml b/ansible/iscsi_freenas/tasks/main.yml similarity index 70% rename from arch/iscsi_freenas/tasks/main.yml rename to ansible/iscsi_freenas/tasks/main.yml index 2737cd1..e69fb17 100644 --- a/arch/iscsi_freenas/tasks/main.yml +++ b/ansible/iscsi_freenas/tasks/main.yml @@ -1,17 +1,6 @@ --- # tasks file for ansible/arch_iscsi # Sync and update Pacman -- name: Sync and update Pacman - community.general.pacman: - update_cache: yes - upgrade: yes - become: yes - tags: update -- name: open-iscsi installed - community.general.pacman: - name: open-iscsi - state: present - become: yes - name: Perform a discovery on freenas.dnet and show available target nodes community.general.open_iscsi: show_nodes: yes @@ -20,9 +9,9 @@ become: yes - name: Enable automatic login for freenas.dnet community.general.open_iscsi: - login: true + login: yes portal: freenas.dnet - auto_portal_startup: true + auto_portal_startup: yes target: iqn.2022-02.freenas.dnet:manjaro-backup become: yes - name: Ensure iscsi service started diff --git a/arch/work_tools/tests/inventory b/ansible/iscsi_freenas/tests/inventory similarity index 100% rename from arch/work_tools/tests/inventory rename to ansible/iscsi_freenas/tests/inventory diff --git a/arch/iscsi_freenas/tests/test.yml b/ansible/iscsi_freenas/tests/test.yml similarity index 100% rename from arch/iscsi_freenas/tests/test.yml rename to ansible/iscsi_freenas/tests/test.yml diff --git a/arch/iscsi_freenas/vars/main.yml b/ansible/iscsi_freenas/vars/main.yml similarity index 100% rename from arch/iscsi_freenas/vars/main.yml rename to ansible/iscsi_freenas/vars/main.yml diff --git a/ansible/minecraft/.travis.yml b/ansible/minecraft/.travis.yml new file mode 100644 index 0000000..36bbf62 --- /dev/null +++ b/ansible/minecraft/.travis.yml @@ -0,0 +1,29 @@ +--- +language: python +python: "2.7" + +# Use the new container infrastructure +sudo: false + +# Install ansible +addons: + apt: + packages: + - python-pip + +install: + # Install ansible + - pip install ansible + + # Check ansible version + - ansible --version + + # Create ansible.cfg with correct roles_path + - printf '[defaults]\nroles_path=../' >ansible.cfg + +script: + # Basic role syntax check + - ansible-playbook tests/test.yml -i tests/inventory --syntax-check + +notifications: + webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/arch/work_tools/README.md b/ansible/minecraft/README.md similarity index 100% rename from arch/work_tools/README.md rename to ansible/minecraft/README.md diff --git a/arch/minecraft/defaults/main.yml b/ansible/minecraft/defaults/main.yml similarity index 100% rename from arch/minecraft/defaults/main.yml rename to ansible/minecraft/defaults/main.yml diff --git a/arch/minecraft/handlers/main.yml b/ansible/minecraft/handlers/main.yml similarity index 100% rename from arch/minecraft/handlers/main.yml rename to ansible/minecraft/handlers/main.yml diff --git a/ansible/minecraft/meta/main.yml b/ansible/minecraft/meta/main.yml new file mode 100644 index 0000000..c572acc --- /dev/null +++ b/ansible/minecraft/meta/main.yml @@ -0,0 +1,52 @@ +galaxy_info: + author: your name + description: your role description + company: your company (optional) + + # If the issue tracker for your role is not on github, uncomment the + # next line and provide a value + # issue_tracker_url: http://example.com/issue/tracker + + # Choose a valid license ID from https://spdx.org - some suggested licenses: + # - BSD-3-Clause (default) + # - MIT + # - GPL-2.0-or-later + # - GPL-3.0-only + # - Apache-2.0 + # - CC-BY-4.0 + license: license (GPL-2.0-or-later, MIT, etc) + + min_ansible_version: 2.1 + + # If this a Container Enabled role, provide the minimum Ansible Container version. + # min_ansible_container_version: + + # + # Provide a list of supported platforms, and for each platform a list of versions. + # If you don't wish to enumerate all versions for a particular platform, use 'all'. + # To view available platforms and versions (or releases), visit: + # https://galaxy.ansible.com/api/v1/platforms/ + # + # platforms: + # - name: Fedora + # versions: + # - all + # - 25 + # - name: SomePlatform + # versions: + # - all + # - 1.0 + # - 7 + # - 99.99 + + galaxy_tags: [] + # List tags for your role here, one per line. A tag is a keyword that describes + # and categorizes the role. Users find roles by searching for tags. Be sure to + # remove the '[]' above, if you add tags to this list. + # + # NOTE: A tag is limited to a single word comprised of alphanumeric characters. + # Maximum 20 tags per role. + +dependencies: [] + # List your role dependencies here, one per line. Be sure to remove the '[]' above, + # if you add dependencies to this list. diff --git a/arch/minecraft/tasks/main.yml b/ansible/minecraft/tasks/main.yml similarity index 100% rename from arch/minecraft/tasks/main.yml rename to ansible/minecraft/tasks/main.yml diff --git a/ansible/minecraft/tests/inventory b/ansible/minecraft/tests/inventory new file mode 100644 index 0000000..878877b --- /dev/null +++ b/ansible/minecraft/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/arch/minecraft/tests/test.yml b/ansible/minecraft/tests/test.yml similarity index 100% rename from arch/minecraft/tests/test.yml rename to ansible/minecraft/tests/test.yml diff --git a/arch/minecraft/vars/main.yml b/ansible/minecraft/vars/main.yml similarity index 100% rename from arch/minecraft/vars/main.yml rename to ansible/minecraft/vars/main.yml diff --git a/ansible/openssh/.travis.yml b/ansible/openssh/.travis.yml new file mode 100644 index 0000000..36bbf62 --- /dev/null +++ b/ansible/openssh/.travis.yml @@ -0,0 +1,29 @@ +--- +language: python +python: "2.7" + +# Use the new container infrastructure +sudo: false + +# Install ansible +addons: + apt: + packages: + - python-pip + +install: + # Install ansible + - pip install ansible + + # Check ansible version + - ansible --version + + # Create ansible.cfg with correct roles_path + - printf '[defaults]\nroles_path=../' >ansible.cfg + +script: + # Basic role syntax check + - ansible-playbook tests/test.yml -i tests/inventory --syntax-check + +notifications: + webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/ansible/openssh/README.md b/ansible/openssh/README.md new file mode 100644 index 0000000..225dd44 --- /dev/null +++ b/ansible/openssh/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/arch/openssh/defaults/main.yml b/ansible/openssh/defaults/main.yml similarity index 100% rename from arch/openssh/defaults/main.yml rename to ansible/openssh/defaults/main.yml diff --git a/arch/openssh/handlers/main.yml b/ansible/openssh/handlers/main.yml similarity index 100% rename from arch/openssh/handlers/main.yml rename to ansible/openssh/handlers/main.yml diff --git a/ansible/openssh/meta/main.yml b/ansible/openssh/meta/main.yml new file mode 100644 index 0000000..c572acc --- /dev/null +++ b/ansible/openssh/meta/main.yml @@ -0,0 +1,52 @@ +galaxy_info: + author: your name + description: your role description + company: your company (optional) + + # If the issue tracker for your role is not on github, uncomment the + # next line and provide a value + # issue_tracker_url: http://example.com/issue/tracker + + # Choose a valid license ID from https://spdx.org - some suggested licenses: + # - BSD-3-Clause (default) + # - MIT + # - GPL-2.0-or-later + # - GPL-3.0-only + # - Apache-2.0 + # - CC-BY-4.0 + license: license (GPL-2.0-or-later, MIT, etc) + + min_ansible_version: 2.1 + + # If this a Container Enabled role, provide the minimum Ansible Container version. + # min_ansible_container_version: + + # + # Provide a list of supported platforms, and for each platform a list of versions. + # If you don't wish to enumerate all versions for a particular platform, use 'all'. + # To view available platforms and versions (or releases), visit: + # https://galaxy.ansible.com/api/v1/platforms/ + # + # platforms: + # - name: Fedora + # versions: + # - all + # - 25 + # - name: SomePlatform + # versions: + # - all + # - 1.0 + # - 7 + # - 99.99 + + galaxy_tags: [] + # List tags for your role here, one per line. A tag is a keyword that describes + # and categorizes the role. Users find roles by searching for tags. Be sure to + # remove the '[]' above, if you add tags to this list. + # + # NOTE: A tag is limited to a single word comprised of alphanumeric characters. + # Maximum 20 tags per role. + +dependencies: [] + # List your role dependencies here, one per line. Be sure to remove the '[]' above, + # if you add dependencies to this list. diff --git a/arch/openssh/tasks/main.yml b/ansible/openssh/tasks/main.yml similarity index 68% rename from arch/openssh/tasks/main.yml rename to ansible/openssh/tasks/main.yml index a95f594..808a6c2 100644 --- a/arch/openssh/tasks/main.yml +++ b/ansible/openssh/tasks/main.yml @@ -1,17 +1,5 @@ --- # SSH -# Sync and update Pacman -- name: Sync and update Pacman - community.general.pacman: - update_cache: yes - upgrade: yes - become: yes - tags: update -- name: Ensure openssh installed - community.general.pacman: - name: openssh - state: present - become: yes - name: Curl SSH trusted CA get_url: url: https://vault.ducoterra.net/v1/ssh-client-signer/public_key @@ -26,8 +14,8 @@ PasswordAuthentication no KbdInteractiveAuthentication no UsePAM yes + Subsystem sftp internal-sftp PrintMotd no # pam does that - Subsystem sftp /usr/lib/ssh/sftp-server TrustedUserCAKeys /etc/ssh/trusted-user-ca-keys.pem become: yes - name: Ensure ssh service started diff --git a/ansible/openssh/tests/inventory b/ansible/openssh/tests/inventory new file mode 100644 index 0000000..878877b --- /dev/null +++ b/ansible/openssh/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/arch/openssh/tests/test.yml b/ansible/openssh/tests/test.yml similarity index 100% rename from arch/openssh/tests/test.yml rename to ansible/openssh/tests/test.yml diff --git a/arch/openssh/vars/main.yml b/ansible/openssh/vars/main.yml similarity index 100% rename from arch/openssh/vars/main.yml rename to ansible/openssh/vars/main.yml diff --git a/ansible/swap/.travis.yml b/ansible/swap/.travis.yml new file mode 100644 index 0000000..36bbf62 --- /dev/null +++ b/ansible/swap/.travis.yml @@ -0,0 +1,29 @@ +--- +language: python +python: "2.7" + +# Use the new container infrastructure +sudo: false + +# Install ansible +addons: + apt: + packages: + - python-pip + +install: + # Install ansible + - pip install ansible + + # Check ansible version + - ansible --version + + # Create ansible.cfg with correct roles_path + - printf '[defaults]\nroles_path=../' >ansible.cfg + +script: + # Basic role syntax check + - ansible-playbook tests/test.yml -i tests/inventory --syntax-check + +notifications: + webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/ansible/swap/README.md b/ansible/swap/README.md new file mode 100644 index 0000000..225dd44 --- /dev/null +++ b/ansible/swap/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/arch/swap/defaults/main.yml b/ansible/swap/defaults/main.yml similarity index 100% rename from arch/swap/defaults/main.yml rename to ansible/swap/defaults/main.yml diff --git a/arch/swap/handlers/main.yml b/ansible/swap/handlers/main.yml similarity index 100% rename from arch/swap/handlers/main.yml rename to ansible/swap/handlers/main.yml diff --git a/ansible/swap/meta/main.yml b/ansible/swap/meta/main.yml new file mode 100644 index 0000000..c572acc --- /dev/null +++ b/ansible/swap/meta/main.yml @@ -0,0 +1,52 @@ +galaxy_info: + author: your name + description: your role description + company: your company (optional) + + # If the issue tracker for your role is not on github, uncomment the + # next line and provide a value + # issue_tracker_url: http://example.com/issue/tracker + + # Choose a valid license ID from https://spdx.org - some suggested licenses: + # - BSD-3-Clause (default) + # - MIT + # - GPL-2.0-or-later + # - GPL-3.0-only + # - Apache-2.0 + # - CC-BY-4.0 + license: license (GPL-2.0-or-later, MIT, etc) + + min_ansible_version: 2.1 + + # If this a Container Enabled role, provide the minimum Ansible Container version. + # min_ansible_container_version: + + # + # Provide a list of supported platforms, and for each platform a list of versions. + # If you don't wish to enumerate all versions for a particular platform, use 'all'. + # To view available platforms and versions (or releases), visit: + # https://galaxy.ansible.com/api/v1/platforms/ + # + # platforms: + # - name: Fedora + # versions: + # - all + # - 25 + # - name: SomePlatform + # versions: + # - all + # - 1.0 + # - 7 + # - 99.99 + + galaxy_tags: [] + # List tags for your role here, one per line. A tag is a keyword that describes + # and categorizes the role. Users find roles by searching for tags. Be sure to + # remove the '[]' above, if you add tags to this list. + # + # NOTE: A tag is limited to a single word comprised of alphanumeric characters. + # Maximum 20 tags per role. + +dependencies: [] + # List your role dependencies here, one per line. Be sure to remove the '[]' above, + # if you add dependencies to this list. diff --git a/arch/swap/tasks/main.yml b/ansible/swap/tasks/main.yml similarity index 80% rename from arch/swap/tasks/main.yml rename to ansible/swap/tasks/main.yml index e54b1ce..c1bd046 100644 --- a/arch/swap/tasks/main.yml +++ b/ansible/swap/tasks/main.yml @@ -12,25 +12,31 @@ command: truncate -s 0 "{{ swap_file_path }}" creates="{{ swap_file_path }}" become: yes + when: swap_file_size_mb != 0 - name: Set swap compression command: chattr +C "{{ swap_file_path }}" become: yes + when: swap_file_size_mb != 0 - name: Allocate swap space command: fallocate -l "{{ swap_file_size_mb }}M" "{{ swap_file_path }}" become: yes + when: swap_file_size_mb != 0 - name: Change swap file permissions file: path="{{ swap_file_path }}" owner=root group=root mode=0600 become: yes + when: swap_file_size_mb != 0 - name: "Check swap file type" command: file {{ swap_file_path }} register: swapfile become: yes + when: swap_file_size_mb != 0 - name: Make swap file command: "mkswap {{ swap_file_path }}" become: yes + when: swap_file_size_mb != 0 - name: Write swap entry in fstab mount: name=none src={{ swap_file_path }} @@ -40,15 +46,19 @@ dump=0 state=present become: yes + when: swap_file_size_mb != 0 - name: Mount swap command: "swapon {{ swap_file_path }}" become: yes + when: swap_file_size_mb != 0 - name: Set swappiness command: sysctl -w vm.swappiness=1 become: yes + when: swap_file_size_mb != 0 - name: Make swappiness permanent copy: dest: "/etc/sysctl.d/99-swappiness.conf" content: | vm.swappiness=1 become: yes + when: swap_file_size_mb != 0 diff --git a/ansible/swap/tests/inventory b/ansible/swap/tests/inventory new file mode 100644 index 0000000..878877b --- /dev/null +++ b/ansible/swap/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/arch/swap/tests/test.yml b/ansible/swap/tests/test.yml similarity index 100% rename from arch/swap/tests/test.yml rename to ansible/swap/tests/test.yml diff --git a/arch/swap/vars/main.yml b/ansible/swap/vars/main.yml similarity index 100% rename from arch/swap/vars/main.yml rename to ansible/swap/vars/main.yml diff --git a/ansible/work_tools/.travis.yml b/ansible/work_tools/.travis.yml new file mode 100644 index 0000000..36bbf62 --- /dev/null +++ b/ansible/work_tools/.travis.yml @@ -0,0 +1,29 @@ +--- +language: python +python: "2.7" + +# Use the new container infrastructure +sudo: false + +# Install ansible +addons: + apt: + packages: + - python-pip + +install: + # Install ansible + - pip install ansible + + # Check ansible version + - ansible --version + + # Create ansible.cfg with correct roles_path + - printf '[defaults]\nroles_path=../' >ansible.cfg + +script: + # Basic role syntax check + - ansible-playbook tests/test.yml -i tests/inventory --syntax-check + +notifications: + webhooks: https://galaxy.ansible.com/api/v1/notifications/ \ No newline at end of file diff --git a/ansible/work_tools/README.md b/ansible/work_tools/README.md new file mode 100644 index 0000000..225dd44 --- /dev/null +++ b/ansible/work_tools/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/arch/work_tools/defaults/main.yml b/ansible/work_tools/defaults/main.yml similarity index 100% rename from arch/work_tools/defaults/main.yml rename to ansible/work_tools/defaults/main.yml diff --git a/arch/work_tools/handlers/main.yml b/ansible/work_tools/handlers/main.yml similarity index 100% rename from arch/work_tools/handlers/main.yml rename to ansible/work_tools/handlers/main.yml diff --git a/ansible/work_tools/meta/main.yml b/ansible/work_tools/meta/main.yml new file mode 100644 index 0000000..c572acc --- /dev/null +++ b/ansible/work_tools/meta/main.yml @@ -0,0 +1,52 @@ +galaxy_info: + author: your name + description: your role description + company: your company (optional) + + # If the issue tracker for your role is not on github, uncomment the + # next line and provide a value + # issue_tracker_url: http://example.com/issue/tracker + + # Choose a valid license ID from https://spdx.org - some suggested licenses: + # - BSD-3-Clause (default) + # - MIT + # - GPL-2.0-or-later + # - GPL-3.0-only + # - Apache-2.0 + # - CC-BY-4.0 + license: license (GPL-2.0-or-later, MIT, etc) + + min_ansible_version: 2.1 + + # If this a Container Enabled role, provide the minimum Ansible Container version. + # min_ansible_container_version: + + # + # Provide a list of supported platforms, and for each platform a list of versions. + # If you don't wish to enumerate all versions for a particular platform, use 'all'. + # To view available platforms and versions (or releases), visit: + # https://galaxy.ansible.com/api/v1/platforms/ + # + # platforms: + # - name: Fedora + # versions: + # - all + # - 25 + # - name: SomePlatform + # versions: + # - all + # - 1.0 + # - 7 + # - 99.99 + + galaxy_tags: [] + # List tags for your role here, one per line. A tag is a keyword that describes + # and categorizes the role. Users find roles by searching for tags. Be sure to + # remove the '[]' above, if you add tags to this list. + # + # NOTE: A tag is limited to a single word comprised of alphanumeric characters. + # Maximum 20 tags per role. + +dependencies: [] + # List your role dependencies here, one per line. Be sure to remove the '[]' above, + # if you add dependencies to this list. diff --git a/arch/work_tools/tasks/main.yml b/ansible/work_tools/tasks/main.yml similarity index 100% rename from arch/work_tools/tasks/main.yml rename to ansible/work_tools/tasks/main.yml diff --git a/ansible/work_tools/tests/inventory b/ansible/work_tools/tests/inventory new file mode 100644 index 0000000..878877b --- /dev/null +++ b/ansible/work_tools/tests/inventory @@ -0,0 +1,2 @@ +localhost + diff --git a/arch/work_tools/tests/test.yml b/ansible/work_tools/tests/test.yml similarity index 100% rename from arch/work_tools/tests/test.yml rename to ansible/work_tools/tests/test.yml diff --git a/arch/work_tools/vars/main.yml b/ansible/work_tools/vars/main.yml similarity index 100% rename from arch/work_tools/vars/main.yml rename to ansible/work_tools/vars/main.yml diff --git a/arch/btrfs_backups/vars/main.yml b/arch/btrfs_backups/vars/main.yml deleted file mode 100644 index 4485fcf..0000000 --- a/arch/btrfs_backups/vars/main.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -snapshots: - path: /.snapshots - -disk: - name: backup0 - # uuid: 1d7ce570-e695-47a0-9dda-5f14b5b20e21 - uuid: 7c482f9b-2e1a-494c-9a93-ddecd483f2b2 - # password: /home/ducoterra/.lukskeys/backup0 - password: /home/ducoterra/.lukskeys/manjaro-laptop-iscsi - -backups: - - / - - /home - -notifications: - user: - name: ducoterra - uid: 1000 diff --git a/arch/developer_tools/vars/main.yml b/arch/developer_tools/vars/main.yml deleted file mode 100644 index fba00e6..0000000 --- a/arch/developer_tools/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for arch/developer_tools diff --git a/framework.md b/framework.md index 4549b7d..c1fe2d1 100644 --- a/framework.md +++ b/framework.md @@ -1,5 +1,9 @@ # Framework Laptop +## Citrix Client + +https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html + ## Fingerprint Sensor ### Sudo Auth