From d778f689932e1cd45f1b7f7148cc4443b288b979 Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Sun, 25 Feb 2018 15:41:47 -0500
Subject: [PATCH] update nextcloud to v13 adjust the ddagent_source script to
 not block on starting or installing integration

---
 dockerfiles/services/nextcloud/Dockerfile              | 2 +-
 dockerfiles/services/nextcloud/docker-compose-prod.yml | 2 +-
 managed_setup.yml                                      | 3 +++
 roles/ddagent_source/tasks/main.yml                    | 2 +-
 roles/motd/tasks/main.yml                              | 7 ++++---
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dockerfiles/services/nextcloud/Dockerfile b/dockerfiles/services/nextcloud/Dockerfile
index 71380f7..918d9da 100644
--- a/dockerfiles/services/nextcloud/Dockerfile
+++ b/dockerfiles/services/nextcloud/Dockerfile
@@ -1,4 +1,4 @@
-FROM nextcloud:latest
+FROM nextcloud:13
 
 RUN apt-get update && apt-get install -y smbclient && rm -rf /var/lib/apt/lists/*
 
diff --git a/dockerfiles/services/nextcloud/docker-compose-prod.yml b/dockerfiles/services/nextcloud/docker-compose-prod.yml
index d2a9a7c..602f842 100644
--- a/dockerfiles/services/nextcloud/docker-compose-prod.yml
+++ b/dockerfiles/services/nextcloud/docker-compose-prod.yml
@@ -30,7 +30,7 @@ services:
         order: start-first
       resources:
         limits:
-          cpus: '1'
+#          cpus: '1'
           memory: 512M
 
     logging:
diff --git a/managed_setup.yml b/managed_setup.yml
index 3388225..5a188ec 100644
--- a/managed_setup.yml
+++ b/managed_setup.yml
@@ -76,6 +76,9 @@
     - debug: var=ansible_os_family
       run_once: true
 
+    - debug: var=ansible_architecture
+      run_once: true
+
   roles:
     - novuso.users
     - user-richard
diff --git a/roles/ddagent_source/tasks/main.yml b/roles/ddagent_source/tasks/main.yml
index c4b5709..91b8fa8 100644
--- a/roles/ddagent_source/tasks/main.yml
+++ b/roles/ddagent_source/tasks/main.yml
@@ -10,7 +10,7 @@
   with_items:
     - python-psutil
 
-- shell: DD_API_KEY=ca0faf176c4aedd4f547ed7cf85615eb sh -c "$(curl -L https://raw.githubusercontent.com/DataDog/dd-agent/master/packaging/datadog-agent/source/setup_agent.sh)"
+- shell: DD_API_KEY=ca0faf176c4aedd4f547ed7cf85615eb DD_SKIP_INTEGRATIONS=1 DD_START_AGENT=0 sh -c "$(curl -L https://raw.githubusercontent.com/DataDog/dd-agent/master/packaging/datadog-agent/source/setup_agent.sh)"
   args:
     creates: "/root/.datadog-agent/bin/agent"
 
diff --git a/roles/motd/tasks/main.yml b/roles/motd/tasks/main.yml
index b2a8030..e7fe617 100644
--- a/roles/motd/tasks/main.yml
+++ b/roles/motd/tasks/main.yml
@@ -1,6 +1,7 @@
 ---
 # main tasks for setting up motd dynamic shell header
 
+- debug: var=ansible_nodename
 
 - name: Install the nginx packages
   apt:
@@ -13,7 +14,7 @@
     - figlet
     - update-motd
     - lm-sensors
-  when: "ansible_nodename != 'cubox-i'"
+  when: ansible_architecture == 'armv7l'
 
 
 - name: remove help text
@@ -23,7 +24,7 @@
   with_items:
     - /etc/update-motd.d/10-help-text
     - /etc/update-motd.d/51-cloudguest
-  when: "ansible_nodename != 'cubox-i'"
+  when: ansible_architecture == 'armv7l'
 
 
 - name: add new info
@@ -34,4 +35,4 @@
   with_items:
     - { src: hostname.sh, dest: 10-hostname }
     - { src: systats.sh, dest: 11-sysstats}
-  when: "ansible_nodename != 'cubox-i'"
+  when: ansible_architecture == 'armv7l'