Drop self-hosted AI (Ollama + SearXNG); gregtime switches to xAI Grok
The Ollama role and SearXNG container backed FISTO AI responses in the greg-time Discord bot. greg-time 3.9.6 drops both (plus the Gemini path) in favor of a single xAI Grok backend, so: - remove the ollama role and its wiring in deploy_home.yml - remove the searxng container task, template, and searxng_path default - gregtime: swap OLLAMA_*/SEARXNG_URL/GEMINI_API_KEY env for XAI_API_KEY, bump image 3.6.5 -> 3.9.6 - vault: add xai_api_key, drop gemini_api_key Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -8,8 +8,6 @@
|
||||
- role: podman
|
||||
# SSL certificates are now handled automatically by Caddy
|
||||
# - role: ssl # REMOVED - Caddy handles all certificate management
|
||||
- role: ollama
|
||||
tags: ollama
|
||||
- role: github-actions
|
||||
- role: graylog-config
|
||||
tags: graylog-config
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
---
|
||||
ollama_models:
|
||||
- dolphin-phi
|
||||
- dolphin-mistral
|
||||
ollama_host: "127.0.0.1"
|
||||
ollama_port: 11434
|
||||
@@ -1,8 +0,0 @@
|
||||
---
|
||||
- name: restart ollama
|
||||
become: true
|
||||
ansible.builtin.systemd:
|
||||
name: ollama
|
||||
state: restarted
|
||||
daemon_reload: true
|
||||
tags: ollama
|
||||
@@ -1,3 +0,0 @@
|
||||
---
|
||||
dependencies:
|
||||
- role: common
|
||||
@@ -1,11 +0,0 @@
|
||||
---
|
||||
- name: check if ollama is already installed
|
||||
ansible.builtin.stat:
|
||||
path: /usr/local/bin/ollama
|
||||
register: ollama_binary
|
||||
|
||||
- name: install ollama via official install script
|
||||
become: true
|
||||
ansible.builtin.shell: |
|
||||
curl -fsSL https://ollama.com/install.sh | sh
|
||||
when: not ollama_binary.stat.exists
|
||||
@@ -1,9 +0,0 @@
|
||||
---
|
||||
- import_tasks: install.yml
|
||||
tags: ollama
|
||||
|
||||
- import_tasks: service.yml
|
||||
tags: ollama
|
||||
|
||||
- import_tasks: models.yml
|
||||
tags: ollama
|
||||
@@ -1,10 +0,0 @@
|
||||
---
|
||||
- name: pull ollama models
|
||||
become: true
|
||||
ansible.builtin.command: ollama pull {{ item }}
|
||||
loop: "{{ ollama_models }}"
|
||||
register: result
|
||||
retries: 3
|
||||
delay: 10
|
||||
until: result is not failed
|
||||
changed_when: "'pulling' in result.stderr or 'pulling' in result.stdout"
|
||||
@@ -1,23 +0,0 @@
|
||||
---
|
||||
- name: create ollama systemd override directory
|
||||
become: true
|
||||
ansible.builtin.file:
|
||||
path: /etc/systemd/system/ollama.service.d
|
||||
state: directory
|
||||
mode: 0755
|
||||
|
||||
- name: template ollama environment override
|
||||
become: true
|
||||
ansible.builtin.template:
|
||||
src: ollama.env.j2
|
||||
dest: /etc/systemd/system/ollama.service.d/override.conf
|
||||
mode: 0644
|
||||
notify: restart ollama
|
||||
|
||||
- name: enable and start ollama service
|
||||
become: true
|
||||
ansible.builtin.systemd:
|
||||
name: ollama
|
||||
enabled: true
|
||||
state: started
|
||||
daemon_reload: true
|
||||
@@ -1,4 +0,0 @@
|
||||
[Service]
|
||||
Environment="OLLAMA_HOST={{ ollama_host }}:{{ ollama_port }}"
|
||||
Environment="OLLAMA_NUM_PARALLEL=1"
|
||||
Environment="OLLAMA_MAX_LOADED_MODELS=1"
|
||||
@@ -19,7 +19,6 @@ fulfillr_dev_path: "{{ podman_volumes }}/fulfillr-dev"
|
||||
fulfillr_dev_server_name: fulfillr-dev.debyltech.com
|
||||
fulfillr_dev_store_database_url: "libsql://debyltech-store-staging-debyltech.aws-us-east-1.turso.io"
|
||||
gregtime_path: "{{ podman_volumes }}/gregtime"
|
||||
searxng_path: "{{ podman_volumes }}/searxng"
|
||||
hass_path: "{{ podman_volumes }}/hass"
|
||||
# nginx_path: removed - nginx no longer used
|
||||
# nosql_path: removed - nosql/redis no longer used
|
||||
|
||||
@@ -40,14 +40,8 @@
|
||||
- host
|
||||
env:
|
||||
TZ: America/New_York
|
||||
# Ollama + SearXNG for FISTO AI responses
|
||||
OLLAMA_HOST: "http://127.0.0.1:11434"
|
||||
OLLAMA_MODEL: "dolphin-mistral"
|
||||
OLLAMA_FALLBACK_MODEL: "dolphin-phi"
|
||||
OLLAMA_NUM_PREDICT: "300"
|
||||
SEARXNG_URL: "http://127.0.0.1:8080"
|
||||
# Gemini API for @bot gemini command
|
||||
GEMINI_API_KEY: "{{ gemini_api_key }}"
|
||||
# xAI Grok API — the bot's sole AI backend
|
||||
XAI_API_KEY: "{{ xai_api_key }}"
|
||||
# Zomboid RCON configuration for Discord restart command
|
||||
ZOMBOID_RCON_HOST: "127.0.0.1"
|
||||
ZOMBOID_RCON_PORT: "{{ zomboid_rcon_port }}"
|
||||
|
||||
@@ -1,59 +0,0 @@
|
||||
---
|
||||
- name: create searxng host directory volumes
|
||||
become: true
|
||||
ansible.builtin.file:
|
||||
path: "{{ item }}"
|
||||
state: directory
|
||||
owner: "{{ podman_subuid.stdout }}"
|
||||
group: "{{ podman_user }}"
|
||||
mode: 0755
|
||||
notify: restorecon podman
|
||||
loop:
|
||||
- "{{ searxng_path }}/config"
|
||||
- "{{ searxng_path }}/data"
|
||||
|
||||
- name: template searxng settings
|
||||
become: true
|
||||
ansible.builtin.template:
|
||||
src: searxng/settings.yml.j2
|
||||
dest: "{{ searxng_path }}/config/settings.yml"
|
||||
owner: "{{ podman_subuid.stdout }}"
|
||||
group: "{{ podman_user }}"
|
||||
mode: 0644
|
||||
|
||||
- name: unshare chown the searxng volumes for internal uid 977
|
||||
become: true
|
||||
become_user: "{{ podman_user }}"
|
||||
changed_when: false
|
||||
ansible.builtin.shell: |
|
||||
podman unshare chown -R 977:977 {{ searxng_path }}/config
|
||||
podman unshare chown -R 977:977 {{ searxng_path }}/data
|
||||
|
||||
- name: flush handlers
|
||||
ansible.builtin.meta: flush_handlers
|
||||
|
||||
- import_tasks: podman/podman-check.yml
|
||||
vars:
|
||||
container_name: searxng
|
||||
container_image: "{{ image }}"
|
||||
|
||||
- name: create searxng container
|
||||
become: true
|
||||
become_user: "{{ podman_user }}"
|
||||
containers.podman.podman_container:
|
||||
name: searxng
|
||||
image: "{{ image }}"
|
||||
restart_policy: on-failure:3
|
||||
log_driver: journald
|
||||
network:
|
||||
- host
|
||||
env:
|
||||
SEARXNG_BASE_URL: "http://127.0.0.1:8080/"
|
||||
volumes:
|
||||
- "{{ searxng_path }}/config:/etc/searxng"
|
||||
- "{{ searxng_path }}/data:/srv/searxng/data"
|
||||
|
||||
- name: create systemd startup job for searxng
|
||||
include_tasks: podman/systemd-generate.yml
|
||||
vars:
|
||||
container_name: searxng
|
||||
@@ -107,14 +107,9 @@
|
||||
image: docker.io/graylog/graylog:7.0.1
|
||||
tags: debyltech, graylog
|
||||
|
||||
- import_tasks: containers/home/searxng.yml
|
||||
vars:
|
||||
image: docker.io/searxng/searxng:latest
|
||||
tags: searxng
|
||||
|
||||
- import_tasks: containers/home/gregtime.yml
|
||||
vars:
|
||||
image: localhost/greg-time-bot:3.6.5
|
||||
image: localhost/greg-time-bot:3.9.6
|
||||
tags: gregtime
|
||||
|
||||
- import_tasks: containers/home/zomboid.yml
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
use_default_settings: true
|
||||
|
||||
general:
|
||||
instance_name: "SearXNG"
|
||||
debug: false
|
||||
|
||||
server:
|
||||
bind_address: "127.0.0.1"
|
||||
port: 8080
|
||||
secret_key: "{{ searxng_secret_key }}"
|
||||
limiter: false
|
||||
image_proxy: false
|
||||
|
||||
search:
|
||||
safe_search: 0
|
||||
formats:
|
||||
- html
|
||||
- json
|
||||
|
||||
engines:
|
||||
- name: duckduckgo
|
||||
engine: duckduckgo
|
||||
disabled: false
|
||||
|
||||
- name: google
|
||||
engine: google
|
||||
disabled: false
|
||||
|
||||
- name: wikipedia
|
||||
engine: wikipedia
|
||||
disabled: false
|
||||
|
||||
- name: bing
|
||||
engine: bing
|
||||
disabled: false
|
||||
Binary file not shown.
Reference in New Issue
Block a user