Merge pull request #308 from cbcoutinho/revert-305-feature/notes
Revert "Feature/notes"
This commit is contained in:
@@ -4,6 +4,3 @@
|
|||||||
[submodule "third_party/oidc"]
|
[submodule "third_party/oidc"]
|
||||||
path = third_party/oidc
|
path = third_party/oidc
|
||||||
url = https://github.com/cbcoutinho/oidc
|
url = https://github.com/cbcoutinho/oidc
|
||||||
[submodule "third_party/notes"]
|
|
||||||
path = third_party/notes
|
|
||||||
url = https://github.com/cbcoutinho/notes
|
|
||||||
|
|||||||
@@ -2,30 +2,4 @@
|
|||||||
|
|
||||||
set -euox pipefail
|
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
|
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
|
|
||||||
|
|||||||
@@ -242,17 +242,6 @@ services:
|
|||||||
profiles:
|
profiles:
|
||||||
- qdrant
|
- 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:
|
volumes:
|
||||||
nextcloud:
|
nextcloud:
|
||||||
db:
|
db:
|
||||||
@@ -262,4 +251,3 @@ volumes:
|
|||||||
keycloak-oauth-storage:
|
keycloak-oauth-storage:
|
||||||
qdrant-data:
|
qdrant-data:
|
||||||
mcp-data:
|
mcp-data:
|
||||||
open-webui:
|
|
||||||
|
|||||||
Vendored
-1
Submodule third_party/notes deleted from 735f06b393
Vendored
+1
-1
Submodule third_party/oidc updated: e83dabbac1...9616294911
Reference in New Issue
Block a user