From 0f68e044a59717b4c71bd0e3a84f7fd2319aabd8 Mon Sep 17 00:00:00 2001 From: Tobias Lehmann Date: Fri, 17 Jan 2025 21:35:12 +0100 Subject: [PATCH] add llama playbook and updated nextcloud --- inventory/hosts.yml | 2 ++ playbooks/lehmann-llama.yml | 25 +++++++++++++++++++++++ requirements.yml | 10 +++++++++ templates/harvester/docker-compose.yml.j2 | 4 ++-- templates/nextcloud/docker-compose.yml.j2 | 19 +++++++++++++++++ 5 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 playbooks/lehmann-llama.yml diff --git a/inventory/hosts.yml b/inventory/hosts.yml index 49f615f..ea46de3 100644 --- a/inventory/hosts.yml +++ b/inventory/hosts.yml @@ -22,3 +22,5 @@ all: ansible_host: 192.168.110.20 urbackup: ansible_host: 192.168.110.21 + llama01: + ansible_host: 192.168.130.52 diff --git a/playbooks/lehmann-llama.yml b/playbooks/lehmann-llama.yml new file mode 100644 index 0000000..4383afc --- /dev/null +++ b/playbooks/lehmann-llama.yml @@ -0,0 +1,25 @@ +# +# +# Automated installation for jellyfin +# +# Project: playbooks +# Author: Tobias Lehmann +# License: MIT License (see LICENSE.md) +# +# Copyright (c) captica GmbH est. 2021 +# +- hosts: "llama01" + vars: + tools_install_users: + - ansible + - root + #ollama_models: + # - mistral + # - llama3.3 + roles: + - linux-base-install + - zsh + - vim + - fzf + - ollama + - open-webui \ No newline at end of file diff --git a/requirements.yml b/requirements.yml index 9c65d2d..6dcfead 100644 --- a/requirements.yml +++ b/requirements.yml @@ -49,6 +49,16 @@ roles: src: git@git.captica.de:captica-automation/de.captica.automation.ansible.role.timescaledb.git scm: git version: main + + - name: ollama + src: git@git.captica.de:captica-automation/de.captica.automation.ansible.role.ollama.git + scm: git + version: main + + - name: open-webui + src: git@git.captica.de:captica-automation/de.captica.automation.ansible.role.open-webui.git + scm: git + version: main # Collections requirements collections: diff --git a/templates/harvester/docker-compose.yml.j2 b/templates/harvester/docker-compose.yml.j2 index c97664b..61f9a06 100644 --- a/templates/harvester/docker-compose.yml.j2 +++ b/templates/harvester/docker-compose.yml.j2 @@ -1,11 +1,11 @@ services: db: - image: timescale/timescaledb:pg16 + image: timescale/timescaledb-ha:pg16 restart: always environment: - POSTGRES_USER=${DB_USER} - POSTGRES_PASSWORD=${DB_PASSWORD} - - POSTGRES_DB=bankmanager + - POSTGRES_DB=harvester networks: - default volumes: diff --git a/templates/nextcloud/docker-compose.yml.j2 b/templates/nextcloud/docker-compose.yml.j2 index 12ecd2d..d4936c7 100644 --- a/templates/nextcloud/docker-compose.yml.j2 +++ b/templates/nextcloud/docker-compose.yml.j2 @@ -64,6 +64,25 @@ services: - db - redis + elasticsearch: + image: docker.elastic.co/elasticsearch/elasticsearch:8.15.1 + container_name: elasticsearch + restart: always + volumes: + - /volumes/nextcloud/elasticsearch/data:/usr/share/elasticsearch/data + ports: + - 9200:9200 + environment: + - discovery.type=single-node + - xpack.security.enabled=true + - ELASTIC_PASSWORD=elastic + - cluster.name=elasticsearch + - bootstrap.memory_lock=true + - ES_JAVA_OPTS=-Xms1g -Xmx1g + - xpack.security.http.ssl.enabled=false + networks: + DEFAULT_NETWORK: + networks: default: ipam: