From ef207330777ab14364751cf57f1ec73ed65cc3d7 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Wed, 8 Feb 2023 14:20:27 -0500
Subject: [PATCH 1/2] WIP does not seem to mount phone.

---
 ansible/playbook.yaml                         |  1 +
 ansible/roles/android/files/dsbmd_rc.conf     |  1 +
 ansible/roles/android/tasks/common.yaml       | 15 ++++++++++
 ansible/roles/android/tasks/freebsd.yaml      | 26 +++++++++++++++++
 ansible/roles/android/tasks/linux.yaml        | 21 ++++++++++++++
 ansible/roles/android/tasks/main.yaml         |  2 ++
 ansible/roles/android/tasks/peruser.yaml      | 29 +++++++++++++++++++
 .../roles/android/tasks/peruser_freebsd.yaml  |  0
 .../roles/android/tasks/peruser_linux.yaml    |  0
 9 files changed, 95 insertions(+)
 create mode 100644 ansible/roles/android/files/dsbmd_rc.conf
 create mode 100644 ansible/roles/android/tasks/common.yaml
 create mode 100644 ansible/roles/android/tasks/freebsd.yaml
 create mode 100644 ansible/roles/android/tasks/linux.yaml
 create mode 100644 ansible/roles/android/tasks/main.yaml
 create mode 100644 ansible/roles/android/tasks/peruser.yaml
 create mode 100644 ansible/roles/android/tasks/peruser_freebsd.yaml
 create mode 100644 ansible/roles/android/tasks/peruser_linux.yaml

diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml
index b06d0bd..012b99c 100644
--- a/ansible/playbook.yaml
+++ b/ansible/playbook.yaml
@@ -40,6 +40,7 @@
     - wireguard
     - portshaker
     - poudriere
+    - android
 
 - hosts: nat_dhcp:homeserver_nat_dhcp
   vars:
diff --git a/ansible/roles/android/files/dsbmd_rc.conf b/ansible/roles/android/files/dsbmd_rc.conf
new file mode 100644
index 0000000..dbf1cba
--- /dev/null
+++ b/ansible/roles/android/files/dsbmd_rc.conf
@@ -0,0 +1 @@
+dsbmd_enable="YES"
diff --git a/ansible/roles/android/tasks/common.yaml b/ansible/roles/android/tasks/common.yaml
new file mode 100644
index 0000000..fef1101
--- /dev/null
+++ b/ansible/roles/android/tasks/common.yaml
@@ -0,0 +1,15 @@
+- import_tasks: tasks/freebsd.yaml
+  when: 'os_flavor == "freebsd"'
+
+- import_tasks: tasks/linux.yaml
+  when: 'os_flavor == "linux"'
+
+- include_tasks:
+    file: tasks/peruser.yaml
+    apply:
+      become: yes
+      become_user: "{{ initialize_user }}"
+  when: users is defined
+  loop: "{{ users | dict2items | community.general.json_query('[?value.initialize==`true`].key') }}"
+  loop_control:
+    loop_var: initialize_user
diff --git a/ansible/roles/android/tasks/freebsd.yaml b/ansible/roles/android/tasks/freebsd.yaml
new file mode 100644
index 0000000..30a371e
--- /dev/null
+++ b/ansible/roles/android/tasks/freebsd.yaml
@@ -0,0 +1,26 @@
+- name: Install packages
+  package:
+    name:
+      - dsbmd
+      - fusefs-simple-mtpfs
+    state: present
+
+- name: Install service configuration
+  copy:
+    src: "files/{{ item }}_rc.conf"
+    dest: "/etc/rc.conf.d/{{ item }}"
+    mode: 0644
+    owner: root
+    group: wheel
+  loop:
+    - dsbmd
+
+- name: Configure sysctls
+  sysctl:
+    name: "{{ item.name }}"
+    value: "{{ item.value }}"
+    state: present
+    sysctl_file: "/etc/sysctl.conf.local"
+  loop:
+    - name: vfs.usermount # Allow regular users to mount storage devices (for dsbmd)
+      value: "1"
diff --git a/ansible/roles/android/tasks/linux.yaml b/ansible/roles/android/tasks/linux.yaml
new file mode 100644
index 0000000..429ad91
--- /dev/null
+++ b/ansible/roles/android/tasks/linux.yaml
@@ -0,0 +1,21 @@
+# - name: Build aur packages
+#   register: buildaur
+#   become_user: "{{ build_user.name }}"
+#   command: "aurutils-sync --no-view {{ item }}"
+#   args:
+#     creates: "/var/cache/pacman/custom/{{ item }}-*.pkg.tar.*"
+#   loop:
+#     - foo
+
+# - name: Update cache
+#   when: buildaur.changed
+#   pacman:
+#     name: []
+#     state: present
+#     update_cache: true
+    
+# - name: Install packages
+#   package:
+#     name:
+#       - foo
+#     state: present
diff --git a/ansible/roles/android/tasks/main.yaml b/ansible/roles/android/tasks/main.yaml
new file mode 100644
index 0000000..6805b9d
--- /dev/null
+++ b/ansible/roles/android/tasks/main.yaml
@@ -0,0 +1,2 @@
+- import_tasks: tasks/common.yaml
+  # when: foo is defined
diff --git a/ansible/roles/android/tasks/peruser.yaml b/ansible/roles/android/tasks/peruser.yaml
new file mode 100644
index 0000000..111e886
--- /dev/null
+++ b/ansible/roles/android/tasks/peruser.yaml
@@ -0,0 +1,29 @@
+- include_role:
+    name: per_user
+
+# - name: Create directories
+#   file:
+#     name: "{{ account_homedir.stdout }}/{{ item }}"
+#     state: directory
+#     mode: 0700
+#     owner: "{{ account_name.stdout }}"
+#     group: "{{ group_name.stdout }}"
+#   loop:
+#     - ".config/foo"
+
+# - name: Copy files
+#   copy:
+#     src: "files/{{ item.src }}"
+#     dest: "{{ account_homedir.stdout }}/{{ item.dest }}"
+#     mode: 0600
+#     owner: "{{ account_name.stdout }}"
+#     group: "{{ group_name.stdout }}"
+#   loop:
+#     - src: foo.conf
+#       dest: .config/foo/foo.conf
+
+- import_tasks: tasks/peruser_freebsd.yaml
+  when: 'os_flavor == "freebsd"'
+
+- import_tasks: tasks/peruser_linux.yaml
+  when: 'os_flavor == "linux"'
diff --git a/ansible/roles/android/tasks/peruser_freebsd.yaml b/ansible/roles/android/tasks/peruser_freebsd.yaml
new file mode 100644
index 0000000..e69de29
diff --git a/ansible/roles/android/tasks/peruser_linux.yaml b/ansible/roles/android/tasks/peruser_linux.yaml
new file mode 100644
index 0000000..e69de29

From aeec8b750f9be5a3bb356d9abca019496c49f936 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sat, 18 Feb 2023 14:49:00 -0500
Subject: [PATCH 2/2] Disable FreeBSD android role and add Linux android role.

---
 ansible/roles/android/tasks/freebsd.yaml      | 48 +++++++++----------
 ansible/roles/android/tasks/linux.yaml        | 11 +++--
 .../roles/package_manager/tasks/linux.yaml    |  6 +++
 3 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/ansible/roles/android/tasks/freebsd.yaml b/ansible/roles/android/tasks/freebsd.yaml
index 30a371e..59f1f7a 100644
--- a/ansible/roles/android/tasks/freebsd.yaml
+++ b/ansible/roles/android/tasks/freebsd.yaml
@@ -1,26 +1,26 @@
-- name: Install packages
-  package:
-    name:
-      - dsbmd
-      - fusefs-simple-mtpfs
-    state: present
+# - name: Install packages
+#   package:
+#     name:
+#       - dsbmd
+#       - fusefs-simple-mtpfs
+#     state: present
 
-- name: Install service configuration
-  copy:
-    src: "files/{{ item }}_rc.conf"
-    dest: "/etc/rc.conf.d/{{ item }}"
-    mode: 0644
-    owner: root
-    group: wheel
-  loop:
-    - dsbmd
+# - name: Install service configuration
+#   copy:
+#     src: "files/{{ item }}_rc.conf"
+#     dest: "/etc/rc.conf.d/{{ item }}"
+#     mode: 0644
+#     owner: root
+#     group: wheel
+#   loop:
+#     - dsbmd
 
-- name: Configure sysctls
-  sysctl:
-    name: "{{ item.name }}"
-    value: "{{ item.value }}"
-    state: present
-    sysctl_file: "/etc/sysctl.conf.local"
-  loop:
-    - name: vfs.usermount # Allow regular users to mount storage devices (for dsbmd)
-      value: "1"
+# - name: Configure sysctls
+#   sysctl:
+#     name: "{{ item.name }}"
+#     value: "{{ item.value }}"
+#     state: present
+#     sysctl_file: "/etc/sysctl.conf.local"
+#   loop:
+#     - name: vfs.usermount # Allow regular users to mount storage devices (for dsbmd)
+#       value: "1"
diff --git a/ansible/roles/android/tasks/linux.yaml b/ansible/roles/android/tasks/linux.yaml
index 429ad91..002cf53 100644
--- a/ansible/roles/android/tasks/linux.yaml
+++ b/ansible/roles/android/tasks/linux.yaml
@@ -14,8 +14,9 @@
 #     state: present
 #     update_cache: true
     
-# - name: Install packages
-#   package:
-#     name:
-#       - foo
-#     state: present
+- name: Install packages
+  package:
+    name:
+      - gvfs
+      - gvfs-mtp
+    state: present
diff --git a/ansible/roles/package_manager/tasks/linux.yaml b/ansible/roles/package_manager/tasks/linux.yaml
index 3997a97..a8c97f9 100644
--- a/ansible/roles/package_manager/tasks/linux.yaml
+++ b/ansible/roles/package_manager/tasks/linux.yaml
@@ -52,3 +52,9 @@
     group: root
   loop:
     - freeze_firefox.conf
+    
+- name: Install packages
+  package:
+    name:
+      - archlinux-keyring
+    state: present