update nextcloud to v13
adjust the ddagent_source script to not block on starting or installing integration
This commit is contained in:
@@ -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/*
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ services:
|
||||
order: start-first
|
||||
resources:
|
||||
limits:
|
||||
cpus: '1'
|
||||
# cpus: '1'
|
||||
memory: 512M
|
||||
|
||||
logging:
|
||||
|
||||
@@ -76,6 +76,9 @@
|
||||
- debug: var=ansible_os_family
|
||||
run_once: true
|
||||
|
||||
- debug: var=ansible_architecture
|
||||
run_once: true
|
||||
|
||||
roles:
|
||||
- novuso.users
|
||||
- user-richard
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
Reference in New Issue
Block a user