diff --git a/.gitmodules b/.gitmodules index 0bbfcae..e70e53a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,3 @@ [submodule "third_party/oidc"] path = third_party/oidc url = https://github.com/cbcoutinho/oidc -[submodule "third_party/notes"] - path = third_party/notes - url = https://github.com/cbcoutinho/notes diff --git a/app-hooks/post-installation/10-install-notes-app.sh b/app-hooks/post-installation/10-install-notes-app.sh index 09d99c9..8704e39 100755 --- a/app-hooks/post-installation/10-install-notes-app.sh +++ b/app-hooks/post-installation/10-install-notes-app.sh @@ -2,30 +2,4 @@ set -euox pipefail -echo "Installing and configuring notes app for testing..." - -# Check if development notes app is mounted at /opt/apps/notes -if [ -d /opt/apps/notes ]; then - echo "Development notes app found at /opt/apps/notes" - - # Remove any existing notes app in apps (from app store or old symlink) - if [ -e /var/www/html/apps/notes ]; then - echo "Removing existing notes in apps..." - rm -rf /var/www/html/apps/notes - fi - - # Create symlink from apps to the mounted development version - # Per Nextcloud docs: apps outside server root need symlinks in server root - echo "Creating symlink: apps/notes -> /opt/apps/notes" - ln -sf /opt/apps/notes /var/www/html/apps/notes - - echo "Enabling notes app from /opt/apps (development mode via symlink)" - php /var/www/html/occ app:enable notes -elif [ -d /var/www/html/apps/notes ]; then - echo "notes app directory found in apps (already installed)" - php /var/www/html/occ app:enable notes -else - echo "notes app not found, installing from app store..." - php /var/www/html/occ app:install notes - php /var/www/html/occ app:enable notes -fi +php /var/www/html/occ app:enable notes diff --git a/docker-compose.yml b/docker-compose.yml index 33a07a0..4669033 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -242,17 +242,6 @@ services: profiles: - qdrant - open-webui: - image: ghcr.io/open-webui/open-webui:main - environment: - - OLLAMA_BASE_URL=https://ollama.internal.coutinho.io - ports: - - 127.0.0.1:3000:8080 - volumes: - - open-webui:/app/backend/data - profiles: - - open-webui - volumes: nextcloud: db: @@ -262,4 +251,3 @@ volumes: keycloak-oauth-storage: qdrant-data: mcp-data: - open-webui: diff --git a/third_party/notes b/third_party/notes deleted file mode 160000 index 735f06b..0000000 --- a/third_party/notes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 735f06b393f3f7f09eaf423a19ebcf47eb9ae5ea diff --git a/third_party/oidc b/third_party/oidc index e83dabb..9616294 160000 --- a/third_party/oidc +++ b/third_party/oidc @@ -1 +1 @@ -Subproject commit e83dabbac17142f7ece6219e5b33ca145fc99ae6 +Subproject commit 96162949117d9325e45e06acd3bbdd0fdb20450c