Commit fb9acc4a authored by Chris Croome's avatar Chris Croome

Merge branch 'galaxy' into 'master'

Galaxy

See merge request !3
parents 353f4b7c 127b9516
roles/docker/
*.retry
......@@ -20,6 +20,12 @@ ansible-playbook clamav.yml -i ${SERVERNAME}, -e "hostname=${SERVERNAME}"
### Collabora
This role depends on the [Webarchitects Docker repo](https://git.coop/webarch/docker) and this Ansible role can be included and updated by running the following command before running the Playbook:
```bash
ansible-galaxy install -r requirements.yml --force -p roles
```
If you want [Collabora](https://nextcloud.com/collaboraonline/) then make sure to set a hostname up for Collabora, eg `collabora.nextcloud.example.org` and point it at the same IP address as you set for `nextcloud.example.org` and then run:
```bash
......@@ -72,6 +78,7 @@ Updating using Ansible (note that this also upgrades Collabora if it is installe
```bash
export SERVERNAME="nextcloud.example.org"
ansible-galaxy install -r requirements.yml --force -p roles
ansible-playbook nextcloud_upgrade.yml -i ${SERVERNAME}, -e "hostname=${SERVERNAME}" -vvv
```
......@@ -88,7 +95,7 @@ exit
Note that there is currently no way to [upgrade apps using the command line](https://github.com/nextcloud/server/issues/8773).
To upgrade Collabora Online either re-run the Collabora Playbook:
To just upgrade Collabora Online either re-run the Collabora Playbook:
```bash
export SERVERNAME="nextcloud.example.org"
......@@ -139,7 +146,6 @@ xcauth --isuser-test admin $( hostname -f )
xcauth --roster-test admin $( hostname -f )
```
## Coturn / Spreed Nextcloud Talk Links
* [Spreed.me and a TURN server](https://help.nextcloud.com/t/complete-nc-installation-on-debian-with-spreed-me-and-turn-step-by-step/2436)
......
......@@ -5,6 +5,10 @@ if [[ -z "${SERVERNAME}" ]]; then
exit 1
fi
echo "Running: ansible-galaxy install -r requirements.yml --force -p roles"
ansible-galaxy install -r requirements.yml --force -p roles
echo "Running: ansible-playbook collabora.yml -i ${SERVERNAME}, -e \"hostname=${SERVERNAME}\" -v"
ansible-playbook collabora.yml -i ${SERVERNAME}, -e "hostname=${SERVERNAME}" -v
......
......@@ -19,6 +19,15 @@
le_ecc: True
# Set this to the directory for the certs
le_dir: /etc/ssl/le
# These nameservers will need changing for installing somewhere other than on Webarchitects servers
nameserver_1: 81.95.52.30
nameserver_2: 81.95.52.27
# If this isn't defined or isn't set to True then Munin won't be configured for Docker
munin_node_install: True
# The Docker Compose version from https://github.com/docker/compose/releases
# if this is undefined it won't be installed or upgraded, docker compose is
# not used or needed so docker_compose_version can be left commented out
#docker_compose_version: 1.22.0
roles:
- docker
......
......@@ -21,6 +21,15 @@
le_ecc: True
# Set this to the directory for the certs
le_dir: /etc/ssl/le
# These nameservers will need changing for installing somewhere other than on Webarchitects servers
nameserver_1: 81.95.52.30
nameserver_2: 81.95.52.27
# If this isn't defined or isn't set to True then Munin won't be configured for Docker
munin_node_install: True
# The Docker Compose version from https://github.com/docker/compose/releases
# if this is undefined it won't be installed or upgraded, docker compose is
# not used or needed so docker_compose_version can be left commented out
#docker_compose_version: 1.22.0
roles:
- nextcloud-upgrade
......
---
- name: docker
src: https://git.coop/webarch/docker.git
version: master
scm: git
---
# https://docs.docker.com/engine/installation/linux/debian/
- name: Git and APT HTTPS packages installed
apt:
pkg: "{{ item }}"
state: latest
update_cache: yes
with_items:
- apt-transport-https
- ca-certificates
- curl
- git
- software-properties-common
- name: Docker GPG key present
apt_key:
id: 0EBFCD88
url: https://download.docker.com/linux/debian/gpg
state: present
- block:
- name: Docker APT repo available
apt_repository:
filename: docker
repo: "deb https://download.docker.com/linux/debian {{ distro }} stable"
state: present
when: ( distro == 'jessie' ) or ( distro == 'stretch' )
- name: Docker CE installed
apt:
name: docker-ce
state: present
update_cache: yes
- name: Docker started
service:
name: docker
state: started
......@@ -7,6 +7,8 @@ fi
echo "Running: ansible-playbook nextcloud.yml -i ${SERVERNAME}, -e \"hostname=${SERVERNAME}\" -v"
ansible-playbook nextcloud.yml -i ${SERVERNAME}, -e "hostname=${SERVERNAME}" -v
echo "Running: ansible-galaxy install -r requirements.yml --force -p roles"
ansible-galaxy install -r requirements.yml --force -p roles
echo "Running: ansible-playbook collabora.yml -i ${SERVERNAME}, -e \"hostname=${SERVERNAME}\" -v"
ansible-playbook collabora.yml -i ${SERVERNAME}, -e "hostname=${SERVERNAME}" -v
echo "Running: ansible-playbook coturn.yml -i ${SERVERNAME}, -e \"hostname=${SERVERNAME}\" -v"
......
......@@ -5,6 +5,10 @@ if [[ -z "${SERVERNAME}" ]]; then
exit 1
fi
echo "Running: ansible-galaxy install -r requirements.yml --force -p roles"
ansible-galaxy install -r requirements.yml --force -p roles
echo "Running: ansible-playbook nextcloud_upgrade.yml -i ${SERVERNAME}, -e \"hostname=${SERVERNAME}\" -v"
ansible-playbook nextcloud_upgrade.yml -i ${SERVERNAME}, -e "hostname=${SERVERNAME}" -v
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment