Merge pull request #79 from compscidr/jason/remove-dead-stuff

Remove dead stuff, fix keyring issues

ansible/inventory.yml

@@ -5,32 +5,28 @@ all:
       hosts:
         ubuntu-server:
           ansible_host: 10.0.0.218
-          max_temp: 91
 # Used in case this is run from outside of the home network
 #          ansible_ssh_common_args: '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ProxyCommand="ssh -W %h:%p -q jason@home.jasonernst.com"'
-        ubuntu-desktop-beast:
-          ansible_host: 10.0.0.89
-          max_temp: 92
+        jason-ubuntu-beast:
 # Used in case this is run from outside of the home network
 #          ansible_ssh_common_args: '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ProxyCommand="ssh -W %h:%p -q jason@home.jasonernst.com"'
         ubuntu-desktop:
           ansible_host: 10.0.0.111
-          max_temp: 90
         jason-ubuntu-laptop:
           ansible_host: 10.0.0.17
         jason-work-ubuntu:
           ansible_host: 10.0.0.15
     development:
       hosts:
         ubuntu-server:
-        ubuntu-desktop-beast:
+        jason-ubuntu-beast:
         ubuntu-desktop:
         jason-ubuntu-laptop:
         jason-work-ubuntu:
     development_gui:
       hosts:
         ubuntu-desktop:
-        ubuntu-desktop-beast:
+        jason-ubuntu-beast:
         jason-ubuntu-laptop:
         jason-work-ubuntu:
     amd:
@@ -39,7 +35,7 @@ all:
         ubuntu-server:
     nvidia:
       hosts:
-        ubuntu-desktop-beast:
+        jason-ubuntu-beast:
     home_jasonernst_com:
       hosts:
         ubuntu-server:

ansible/meta/requirements.yml

@@ -10,6 +10,8 @@ roles:
     version: "0.0.2"
   - name: compscidr.gpg
     version: "0.0.2"
+  - name: gantsign.visual-studio-code
+    version: "7.0.0"
 
 collections:
   - name: community.docker

ansible/playbook.yml

@@ -11,26 +11,11 @@
     - common/ssh
     - common/software
 
-- name: Tasks for LAN Hosts
-  hosts: lan
-  vars_files:
-    - vars/deb_arch.yml
-    - vars/user.yml
-  roles:
-    - common/lan
-
-- name: Tasks for WAN hosts
-  hosts: all, !lan
-  vars_files:
-    - vars/deb_arch.yml
-    - vars/user.yml
-  roles:
-    - common/wan
-
 - name: Non-GUI Development Software
   hosts: development
   vars_files:
     - vars/deb_arch.yml
+    - vars/user.yml
   roles:
     - development/shell
     - development/ops
@@ -42,7 +27,6 @@
     - development/ziglang
     - development/ruby
     - development/rust
-#    - tunnels
 
 - name: Development Software for GUIs
   hosts: development_gui
@@ -67,23 +51,10 @@
     - home_jasonernst_com/sonarr
     - home_jasonernst_com/radarr
     - home_jasonernst_com/rust_game
-    - home_jasonernst_com/honeygain
     - home_jasonernst_com/sabnzbd
     - gh_actions/ipv6-docker
-#    - gh_actions/bump-jvm
-    - gh_actions/bump-android
     - gh_actions/compscidr
 
-- name: Services for ubuntu-desktop
-  hosts: ubuntu-desktop
-  vars_files:
-    - vars/deb_arch.yml
-    - vars/user.yml
-  roles:
-    - gh_actions/ipv6-docker
-    - gh_actions/bump-jvm
-    - gh_actions/bump-android
-
 - name: Services for www.jasonernst.com
   hosts: www_jasonernst_com
   vars_files:
@@ -94,16 +65,6 @@
     - web_common/letsencrypt
     - www_jasonernst_com/goblog
 
-- name: Services for lp.jasonernst.com
-  hosts: lp_jasonernst_com
-  vars_files:
-    - vars/deb_arch.yml
-    - vars/user.yml
-  roles:
-    - lp_jasonernst_com/grafana
-    - livepeer/orchestrator
-    - lp_jasonernst_com/prometheus
-
 - name: Services for ombi.jasonernst.com
   hosts: ombi_jasonernst_com
   vars_files:
@@ -114,28 +75,3 @@
     # - web_common/nginx
     # - web_common/letsencrypt
     - ombi_jasonernst_com/ombi
-
-# - name: AMD GPU related tasks
-#   hosts: amd
-#   vars_files:
-#     - vars/deb_arch.yml
-#   roles:
-#     - lolminer/amd
-#     - livepeer/transcoder_cpu
-
-# - name: Nvidia GPU related tasks
-#   hosts: nvidia
-#   vars_files:
-#     - vars/deb_arch.yml
-#   roles:
-#     - lolminer/nvidia
-#     - livepeer/transcoder_gpu
-
-# this is the only computer that seems to be fast enough to keep up to the network
-# tried previously on ubuntu-desktop and ubuntu-server, but no dice.
-# disabled because using an external service now
-# - name: Ethereum
-#   tags: ethereum
-#   hosts: ubuntu-desktop-beast
-#   roles:
-#     - ethereum/fullnode

ansible/roles/common/software/tasks/main.yml

@@ -67,32 +67,6 @@
     groups: docker
     append: true
 
-# github cli
-- name: add git cli GPG apt key
-  tags: git
-  become: true
-  ansible.builtin.apt_key:
-    keyserver: keyserver.ubuntu.com
-    id: 23F3D4EA75716059
-
-- name: add github cli repository
-  tags: git
-  become: true
-  ansible.builtin.apt_repository:
-    repo: >
-      deb [arch={{ [ansible_architecture] | map('extract', deb_architecture) | first }}]
-      https://cli.github.com/packages {{ ansible_distribution_release }} main
-    state: present
-  when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'focal'
-
-# - name: update apt and install gh
-#   tags: git
-#   become: true
-#   ansible.builtin.apt:
-#     update_cache: true
-#     name: gh
-#     state: present
-
 # don't lint-fix this or it will break the task
 - name: setup default git configuration
   tags: git

ansible/roles/common/ssh/tasks/main.yml

@@ -30,64 +30,12 @@
     owner: "{{ username }}"
     group: "{{ username }}"
 
-- name: ssh github_id_rsa
-  become: true
-  tags: ssh
-  ansible.builtin.copy:
-    src: github_id_rsa
-    dest: "/home/{{ username }}/.ssh/github_id_rsa"
-    mode: '0600'
-    owner: "{{ username }}"
-    group: "{{ username }}"
-
-- name: ssh github_id_rsa.pub
-  become: true
-  tags: ssh
-  ansible.builtin.copy:
-    src: github_id_rsa.pub
-    dest: "/home/{{ username }}/.ssh/github_id_rsa.pub"
-    mode: '0644'
-    owner: "{{ username }}"
-    group: "{{ username }}"
-
-- name: Add github to ssh/config
-  become: true
-  tags: ssh
-  ansible.builtin.blockinfile:
-    create: true
-    mode: '0600'
-    owner: "{{ username }}"
-    group: "{{ username }}"
-    path: "/home/{{ username }}/.ssh/config"
-    block: |
-      Host github.com
-      Hostname github.com
-      User git
-      IdentityFile ~/.ssh/github_id_rsa
-    marker: "# {mark} ANSIBLE MANAGED BLOCK github"
-
 - name: Add work key
   become: true
   tags: ssh
   ansible.builtin.copy:
-    src: jason-test.pem
-    dest: "/home/{{ username }}/.ssh/jason-test.pem"
-    mode: '0600'
-    owner: "{{ username }}"
-    group: "{{ username }}"
-
-- name: Add work key to ssh/config
-  become: true
-  tags: ssh
-  ansible.builtin.blockinfile:
-    create: true
+    src: bump.pem
+    dest: "/home/{{ username }}/.ssh/bump.pem"
     mode: '0600'
     owner: "{{ username }}"
     group: "{{ username }}"
-    path: "/home/{{ username }}/.ssh/config"
-    block: |
-      Host ec2-54-84-236-202.compute-1.amazonaws.com
-      Hostname ec2-54-84-236-202.compute-1.amazonaws.com
-      User ubuntu
-      IdentityFile ~/.ssh/jason-test.pem
-    marker: "# {mark} ANSIBLE MANAGED BLOCK github"

ansible/roles/common/user/tasks/main.yml

@@ -43,7 +43,7 @@
   become: true
   ansible.builtin.copy:
     src: files/ssh/authorized_keys
-    dest: /home/{{ username }}/.ssh/authorized_keys"
+    dest: /home/{{ username }}/.ssh/authorized_keys
     mode: '0600'
     owner: "{{ username }}"
     group: "{{ username }}"