From 3e8358b7b3424b544c4ca90cfa434e4a192f1f8b Mon Sep 17 00:00:00 2001
From: Tim Moody <tim@timmoody.com>
Date: Fri, 8 Feb 2019 17:45:43 -0500
Subject: [PATCH] restructure

---
 roles/minetest/tasks/main.yml                 | 56 ++++++-------
 roles/minetest/tasks/minetest_install.yml     | 83 +------------------
 roles/minetest/tasks/rpi_minetest_install.yml | 40 ---------
 3 files changed, 30 insertions(+), 149 deletions(-)

diff --git a/roles/minetest/tasks/main.yml b/roles/minetest/tasks/main.yml
index e961eef81..318198199 100644
--- a/roles/minetest/tasks/main.yml
+++ b/roles/minetest/tasks/main.yml
@@ -1,38 +1,21 @@
-# Give message and end play for unsupported platforms
-# For now only support rpi
-
-- name: No install except Raspberry Pi for now
-  debug:
-    msg: "No install except Raspberry Pi for now."
-  when: not is_rpi
-
-# CAUTION: this stanza causes iiab-install to exit on Ubuntu/Debian/etc -- without completing roles/network
-- name: Terminate play if not Raspberry Pi
-  meta: end_play
-  when: not is_rpi
-
-- include_tasks: calc_vars.yml
-
-- name: Ensure Linux group '{{ minetest_runas_group }}' exists
-  group:
-    name: "{{ minetest_runas_group }}"
-    state: present
-  when: minetest_runas_user != 'root'
-
-- name: Ensure Linux user '{{ minetest_runas_user }}' exists
-  user:
-    name: "{{ minetest_runas_user }}"
-    groups: "{{ minetest_runas_group }}"
-    state: present
-    createhome: no
-    shell: /bin/false
-  when: minetest_runas_user != 'root'
-
 - name: Check for minetest world file ({{ minetest_world_dir }}/world.mt)
   stat:
     path: "{{ minetest_world_dir }}/world.mt"
   register: minetest_world
 
+- name: Create dirs /etc/minetest and /library/games
+  file:
+    state: directory
+    path: "{{ item }}"
+    owner: root
+    group: root
+    mode: 0755
+  with_items:
+    - /etc/minetest
+    - /library/games
+    - /var/log/minetest
+  when: minetest_install
+
 # rpi only
 - include_tasks: rpi_minetest_install.yml
   when: minetest_install and not minetest_world.stat.exists and is_rpi
@@ -60,6 +43,19 @@
       url: https://github.com/Uberi/Minetest-WorldEdit/archive/master.zip
   when: minetest_install
 
+- name: Create /etc/minetest/minetest.conf and minetest-serve.service
+  template:
+    backup: no
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    owner: root
+    group: root
+    mode: 0644
+  with_items:
+    - { src: 'minetest.conf.j2', dest: '/etc/minetest/minetest.conf' }
+    - { src: 'minetest-serve.service.j2', dest: '/etc/systemd/system/minetest-serve.service' }
+  when: minetest_install
+
 # enable or disable
 - name: Enable & Restart 'minetest-serve' service
   systemd:
diff --git a/roles/minetest/tasks/minetest_install.yml b/roles/minetest/tasks/minetest_install.yml
index 89e727001..099a88452 100644
--- a/roles/minetest/tasks/minetest_install.yml
+++ b/roles/minetest/tasks/minetest_install.yml
@@ -1,82 +1,7 @@
 # For non-rpi installs
 # Still a work in progress
 
-# COMPARE tasks/calc_vars.yml
-- name: Set some facts
-  set_fact:
-    minetest_server_bin: /usr/lib/minetest/minetestserver
-#    minetest_world_dir: /var/games/minetest-server/.minetest/worlds/world/ should be in library
-    minetest_mods_dir: /usr/share/games/minetest_game/mods/
-
-# Taken care of near top of tasks/main.yml
-#
-#- name: Ensure Linux group '{{ minetest_runas_group }}' exists
-#  group:
-#    name: "{{ minetest_runas_group }}"
-#    state: present
-#  when: minetest_runas_user != 'root'
-#
-#- name: Ensure Linux user '{{ minetest_runas_user }}' exists
-#  user:
-#    name: "{{ minetest_runas_user }}"
-#    groups: "{{ minetest_runas_group }}"
-#    state: present
-#    createhome: no
-#    shell: /bin/false
-#  when: minetest_runas_user != 'root'
-
-# SEE "Check for minetest world file" in tasks/main.yml
-#
-#- name: Create dir minetest_world_dir ({{ minetest_world_dir }})
-#  file:
-#    state: directory
-#    path: "{{ minetest_world_dir }}"
-#    owner: "{{ minetest_runas_user }}"
-#    group: "{{ minetest_runas_group }}"
-#    mode: 0755
-
-#- name: Warn if not Raspberry Pi
-#  debug:
-#    msg: "No install except Raspberry Pi for now."
-#  when: not is_rpi
-
-- name: Download Minetest if not package
-  get_url:
-    url: "{{ rpi_src_url }}"
-    dest: "{{ downloads_dir }}/{{ rpi_src }}"
-    timeout: "{{ download_timeout }}"
-  #when: is_rpi
-
-- name: Install Minetest if not package
-  debug:
-    msg: "placeholder."
-  #when: is_rpi
-
-- name: Create /etc/minetest
-  file:
-    state: directory
-    path: /etc/minetest
-    owner: root
-    group: root
-    mode: 0755
-
-# - name: move files to world dir
-
-- name: 'Change minetest_server_bin: /usr/bin/minetest-server if not RPi'
-  set_fact:
-    minetest_server_bin: /usr/bin/minetest-server
-  #when: not is_rpi
-
-- name: Create minetest-server service and minetest.conf file
-  template:
-    backup: no
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    owner: root
-    group: root
-    mode: 0644
-  with_items:
-    - { src: 'minetest.conf.j2', dest: '/etc/minetest/minetest.conf' }
-    - { src: 'minetest-serve.service.j2', dest: '/etc/systemd/system/minetest-serve.service' }
-
-# - name: Start minetest
+- name: Install Minetest package
+  package:
+    name: minetest
+    state: present
diff --git a/roles/minetest/tasks/rpi_minetest_install.yml b/roles/minetest/tasks/rpi_minetest_install.yml
index 77e31cedf..8fc0758d4 100644
--- a/roles/minetest/tasks/rpi_minetest_install.yml
+++ b/roles/minetest/tasks/rpi_minetest_install.yml
@@ -1,44 +1,16 @@
 # For rpi installs
 
-- name: Set some facts
-  set_fact:
-    rpi_src_url: http://www.nathansalapat.com/downloads/0.4.17.1.tar.gz
-    rpi_src: minetest-0.4.17.1.tar.gz
-
 - name: Install 'libhiredis-dev' package for Minetest
   package:
     name: libhiredis-dev
     state: present
 
-#- name: Minetest already installed - terminate play
-#  meta: end_play
-#  when: minetest_world.stat.exists
-
 - name: Download Minetest {{ rpi_src_url }} for RPi
   get_url:
     url: "{{ rpi_src_url }}"
     dest: "{{ downloads_dir }}/{{ rpi_src }}"
     timeout: "{{ download_timeout }}"
 
-- name: Create dirs /etc/minetest and /library/games
-  file:
-    state: directory
-    path: "{{ item }}"
-    owner: root
-    group: root
-    mode: 0755
-  with_items:
-    - /etc/minetest
-    - /library/games
-
-- name: Create dir /var/log/minetest
-  file:
-    state: directory
-    path: /var/log/minetest
-    owner: "{{ minetest_runas_user }}"
-    group: "{{ minetest_runas_group }}"
-    mode: 0755
-
 - name: Extract {{ downloads_dir }}/{{ rpi_src }} into /library/games
   unarchive:
     src: "{{ downloads_dir }}/{{ rpi_src }}"
@@ -53,15 +25,3 @@
     dest: /library/games/minetest
     owner: "{{ minetest_runas_user }}"
     group: "{{ minetest_runas_group }}"
-
-- name: Create /etc/minetest/minetest.conf and minetest-serve.service
-  template:
-    backup: no
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-    owner: root
-    group: root
-    mode: 0644
-  with_items:
-    - { src: 'minetest.conf.j2', dest: '/etc/minetest/minetest.conf' }
-    - { src: 'minetest-serve.service.j2', dest: '/etc/systemd/system/minetest-serve.service' }