summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chaos-at-home/ch-raspi-ntp.yml10
-rw-r--r--inventory/group_vars/chaos-at-home/network.yml2
-rw-r--r--inventory/host_vars/ch-raspi-ntp.yml2
-rw-r--r--inventory/hosts.ini3
-rw-r--r--roles/slim/raspbian/defaults/main.yml4
-rw-r--r--roles/slim/raspbian/tasks/main.yml72
6 files changed, 3 insertions, 90 deletions
diff --git a/chaos-at-home/ch-raspi-ntp.yml b/chaos-at-home/ch-raspi-ntp.yml
deleted file mode 100644
index 5ba57a5a..00000000
--- a/chaos-at-home/ch-raspi-ntp.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: Basic Setup
- hosts: ch-raspi-ntp
- roles:
- - role: slim/raspbian
-# - role: apt-repo/base ## TODO: this role does not yet support rasbian since detection is not as trivial as one would think
- - role: core/base
- - role: core/sshd/base
- - role: core/zsh
- - role: core/admin-users
diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index 655a7088..e0f29724 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -28,7 +28,7 @@ network_zones:
ch-hpws-maxi: 30
ch-hpws-mini1: 31
ch-alix1d: 32
- ch-raspi-ntp: 33
+ ch-raspi-openwrt: 33
ch-cm4-test: 34
ch-rpi4-test: 35
ch-rpi3-test: 36
diff --git a/inventory/host_vars/ch-raspi-ntp.yml b/inventory/host_vars/ch-raspi-ntp.yml
deleted file mode 100644
index 4f8d6a66..00000000
--- a/inventory/host_vars/ch-raspi-ntp.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-raspbian_disable_wifi: false
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index fb5f883d..ddaca8cf 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -60,7 +60,7 @@ ch-k8s-ctrl host_name=k8s-ctrl
ch-hpws-maxi
ch-hpws-mini1
ch-alix1d
-ch-raspi-ntp
+ch-raspi-openwrt
ch-cm4-test
ch-rpi4-test
ch-rpi3-test
@@ -313,6 +313,7 @@ ch-alix1d
ch-testvm-openwrt
ch-installsmb
ch-gw-c3voc
+ch-raspi-openwrt
mz-ap
mz-router
glt-gw-r3
diff --git a/roles/slim/raspbian/defaults/main.yml b/roles/slim/raspbian/defaults/main.yml
deleted file mode 100644
index a41afb00..00000000
--- a/roles/slim/raspbian/defaults/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-raspbian_disable_wifi: true
-raspbian_disable_bluetooth: true
-raspbian_disable_audio: true
diff --git a/roles/slim/raspbian/tasks/main.yml b/roles/slim/raspbian/tasks/main.yml
deleted file mode 100644
index 39b0c66f..00000000
--- a/roles/slim/raspbian/tasks/main.yml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- name: remove legacy device-tree overlays for rpi3
- loop:
- - pi3-disable-wifi
- - pi3-disable-bt
- lineinfile:
- path: /boot/config.txt
- line: "dtoverlay={{ item }}"
- state: absent
-
-- name: enable/disable bluetooh
- lineinfile:
- path: /boot/config.txt
- line: dtoverlay=disable-bt
- insertafter: '^\[all\]'
- state: "{{ raspbian_disable_bluetooth | ternary('present', 'absent') }}"
-
-- name: enable/disable wifi
- lineinfile:
- path: /boot/config.txt
- line: dtoverlay=disable-wifi
- insertafter: '^\[all\]'
- state: "{{ raspbian_disable_wifi | ternary('present', 'absent') }}"
-
-- name: enable/disable bluetooh
- lineinfile:
- path: /boot/config.txt
- line: dtoverlay=disable-bt
- insertafter: '^\[all\]'
- state: "{{ raspbian_disable_bluetooth | ternary('present', 'absent') }}"
-
-- name: enable/disable audio
- lineinfile:
- path: /boot/config.txt
- regexp: '^dtparam=audio='
- line: "dtparam=audio={{ raspbian_disable_audio | ternary('off', 'on') }}"
-
-- name: enable ssh-server
- systemd:
- name: ssh
- enabled: yes
-
-- name: remove pi user
- user:
- name: pi
- state: absent
- remove: yes
- force: yes
-
-- name: remove sudoers config for pi user
- file:
- path: /etc/sudoers.d/010_pi-nopasswd
- state: absent
-
-- name: set hostname
- hostname:
- name: "{{ host_name }}"
-
-- name: update hostname in /etc/hosts
- lineinfile:
- path: /etc/hosts
- backrefs: yes
- regexp: '^(127.0.1.1\s+)'
- line: '\g<1>{{ host_name }}'
-
-- name: remove vscode sources.list and microsoft gpg key
- loop:
- - sources.list.d/vscode.list
- - trusted.gpg.d/microsoft.gpg
- file:
- path: "/etc/apt/{{ item }}"
- state: absent