From 55eca663a9e72fc101fa1e82958e20702bc7b1fb Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Fri, 27 Mar 2020 17:23:07 +0000
Subject: [PATCH] Replace f@h container with lsio one

Also move configuration into web UI, just because it's easier
---
 .../files/folding-at-home/docker-compose.yml      | 14 +++++++-------
 ansible/roles/docker/tasks/folding-at-home.yml    | 15 ++++++---------
 ansible/roles/docker/vars/folding-at-home.yml     |  8 --------
 3 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 ansible/roles/docker/vars/folding-at-home.yml

diff --git a/ansible/roles/docker/files/folding-at-home/docker-compose.yml b/ansible/roles/docker/files/folding-at-home/docker-compose.yml
index 151c9ff..7d11b38 100644
--- a/ansible/roles/docker/files/folding-at-home/docker-compose.yml
+++ b/ansible/roles/docker/files/folding-at-home/docker-compose.yml
@@ -2,15 +2,15 @@ version: "2.3"
 
 services:
   folding-at-home:
-    image: yurinnick/folding-at-home:latest
+    image: linuxserver/foldingathome:latest
     container_name: folding-at-home
-    command: --allow 0/0 --web-allow 0/0 --power light --cpu-usage 35
+    cpus: 1
     environment:
-      - USER=TheOrangeOne
-      - TEAM=223518
-      - PASSKEY={{ foh_token }}
-      - ENABLE_GPU=false
-      - ENABLE_SMP=true
+      - TZ=Europe/London
+      - PUID={{ docker_user.id }}
+      - GUID={{ docker_user.id }}
+    volumes:
+      - ./config:/config
     ports:
       - 7396:7396
       - 36330:36330
diff --git a/ansible/roles/docker/tasks/folding-at-home.yml b/ansible/roles/docker/tasks/folding-at-home.yml
index 112134b..7be8432 100644
--- a/ansible/roles/docker/tasks/folding-at-home.yml
+++ b/ansible/roles/docker/tasks/folding-at-home.yml
@@ -1,27 +1,24 @@
-- name: Include foh variables
-  include_vars: folding-at-home.yml
-
-- name: Create foh directory
+- name: Create folding-at-home directory
   file:
-    path: /opt/foh
+    path: /opt/folding-at-home
     state: directory
     owner: "{{ docker_user.name }}"
     mode: "{{ docker_compose_directory_mask }}"
   become: true
 
-- name: Install foh compose file
+- name: Install folding@home compose file
   template:
     src: files/folding-at-home/docker-compose.yml
-    dest: /opt/foh/docker-compose.yml
+    dest: /opt/folding-at-home/docker-compose.yml
     mode: "{{ docker_compose_file_mask }}"
     owner: "{{ docker_user.name }}"
     validate: /usr/bin/docker-compose -f %s config
   register: compose_file
   become: true
 
-- name: Cycle foh container
+- name: Cycle folding@home container
   docker_compose:
-    project_src: /opt/foh
+    project_src: /opt/folding-at-home
     pull: true
     remove_orphans: true
     remove_volumes: true
diff --git a/ansible/roles/docker/vars/folding-at-home.yml b/ansible/roles/docker/vars/folding-at-home.yml
deleted file mode 100644
index 41e15b7..0000000
--- a/ansible/roles/docker/vars/folding-at-home.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-foh_token: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  38393937366266353162336339643261613138616135643163393464353339653761623833303334
-  3136633535616165383561623863346630326264663564360a613733313835646333373464313033
-  65303338646665346532653232626535363665636132333065343133636332383663393034373863
-  3437626337666539610a656264653135656566313133383935396233313366633961333637373363
-  30326130623936383437636465393262633735656563323337666235373834363833396336343866
-  6362626138313266633032633466386461643737336266623363