Compare commits

...

11 Commits

Author SHA1 Message Date
6b79ac67c1 chore: publish 9.1.0+29.0.5-fpm release
Some checks failed
continuous-integration/drone/pr Build is failing
2024-09-30 16:21:02 +02:00
a5bb4e9252 fix function 2024-09-30 14:10:40 +02:00
514c313a94 Merge branch 'add-theming' of ssh://git.coopcloud.tech:2222/coop-cloud/nextcloud into add-theming 2024-09-30 14:07:44 +02:00
a537d0797f fix function 2024-09-30 14:07:38 +02:00
97dffc3d3e set logo url 2024-09-30 11:35:57 +02:00
4878c76065 2024-09-27 22:18:37 +02:00
c94ffed09d chore: publish 9.0.0+29.0.5-fpm release
Some checks failed
continuous-integration/drone/push Build is failing
2024-08-26 18:11:43 +01:00
7a863573c9 Merge pull request 'add abra command for disabling the skeleton directory' (#42) from Apfelwurm/nextcloud:main into main
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #42
Reviewed-by: decentral1se <decentral1se@noreply.git.coopcloud.tech>
2024-07-21 15:56:43 +00:00
c930bbcf56 chore: publish 8.0.1+29.0.3-fpm release
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/tag Build is passing
2024-07-19 18:51:54 +02:00
a13e7a509c add abra command for disabling the skeleton directory
Some checks failed
continuous-integration/drone/pr Build is failing
2024-07-19 17:58:06 +02:00
0f9aba3e9e alaconnect: replace 'execute' with 'initial-hooks'
Some checks failed
continuous-integration/drone/push Build is failing
2024-07-15 13:57:58 +02:00
7 changed files with 45 additions and 11 deletions

View File

@ -44,6 +44,13 @@ DEFAULT_QUOTA="10 GB"
# MAIL_DOMAIN= # MAIL_DOMAIN=
# SECRET_SMTP_PASSWORD_VERSION=v1 # SECRET_SMTP_PASSWORD_VERSION=v1
## Customization
# THEMING_COLOR=
# THEMING_SLOGAN=
# COPY_ASSETS="flow_background.jpg|app:/var/www/html/themes/background.jpg"
# COPY_ASSETS="$COPY_ASSETS icon_left_brand.svg|app:/var/www/html/themes/logo.svg"
# COPY_ASSETS="$COPY_ASSETS icon.png|app:/web/dist/assets/icons/icon.png"
# APPS="calendar" # APPS="calendar"
# COLLABORA_URL=https://collabora.example.com # COLLABORA_URL=https://collabora.example.com

26
abra.sh
View File

@ -52,6 +52,27 @@ set_logfile_stdout() {
set_system_config logfile '/dev/stdout' set_system_config logfile '/dev/stdout'
} }
customize() {
if [ -z "$1" ]
then
echo "Usage: ... customize <assets_path>"
exit 1
fi
asset_dir=$1
for asset in $COPY_ASSETS; do
source=$(echo $asset | cut -d "|" -f1)
target=$(echo $asset | cut -d "|" -f2)
echo copy $source to $target
abra app cp $APP_NAME $asset_dir/$source $target
done
abra app cmd -T $APP_NAME app set_app_config theming color \"$THEMING_COLOR\"
abra app cmd -T $APP_NAME app set_app_config theming slogan \"$THEMING_SLOGAN\"
abra app cmd -T $APP_NAME app run_occ '"theming:config background \"/var/www/html/themes/flow_background.jpg\""'
abra app cmd -T $APP_NAME app run_occ '"theming:config logo \"/var/www/html/themes/icon_left_brand.svg\""'
abra app cmd -T $APP_NAME app run_occ '"theming:config logoheader \"/var/www/html/themes/icon.png\""'
}
install_bbb() { install_bbb() {
install_apps bbb install_apps bbb
set_app_config bbb app.navigation true set_app_config bbb app.navigation true
@ -89,6 +110,7 @@ set_authentik() {
install_apps sociallogin install_apps sociallogin
AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret) AUTHENTIK_SECRET=$(cat /run/secrets/authentik_secret)
AUTHENTIK_ID=$(cat /run/secrets/authentik_id) AUTHENTIK_ID=$(cat /run/secrets/authentik_id)
set_system_config logo_url https://$AUTHENTIK_DOMAIN
set_app_config sociallogin custom_providers " set_app_config sociallogin custom_providers "
{ {
\"custom_oidc\":[ \"custom_oidc\":[
@ -121,3 +143,7 @@ set_authentik() {
run_occ 'config:system:set allow_user_to_change_display_name --value=false' run_occ 'config:system:set allow_user_to_change_display_name --value=false'
run_occ 'config:system:set lost_password_link --value=disabled' run_occ 'config:system:set lost_password_link --value=disabled'
} }
disable_skeletondirectory() {
run_occ "config:system:set skeletondirectory --value ''"
}

View File

@ -5,7 +5,7 @@ authentik:
- AUTHENTIK_DOMAIN - AUTHENTIK_DOMAIN
- SECRET_AUTHENTIK_SECRET_VERSION - SECRET_AUTHENTIK_SECRET_VERSION
- SECRET_AUTHENTIK_ID_VERSION - SECRET_AUTHENTIK_ID_VERSION
execute: initial-hooks:
- app set_authentik - app set_authentik
shared_secrets: shared_secrets:
nextcloud_secret: authentik_secret nextcloud_secret: authentik_secret
@ -15,10 +15,10 @@ onlyoffice:
- compose.onlyoffice.yml - compose.onlyoffice.yml
- ONLYOFFICE_URL - ONLYOFFICE_URL
- SECRET_ONLYOFFICE_JWT_VERSION - SECRET_ONLYOFFICE_JWT_VERSION
execute: initial-hooks:
- app install_onlyoffice - app install_onlyoffice
collabora: collabora:
uncomment: uncomment:
- COLLABORA_URL - COLLABORA_URL
execute: initial-hooks:
- app install_collabora - app install_collabora

View File

@ -2,7 +2,7 @@ version: "3.8"
services: services:
elasticsearch: elasticsearch:
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4" image: "docker.elastic.co/elasticsearch/elasticsearch:8.15.0"
environment: environment:
- cluster.name=docker-cluster - cluster.name=docker-cluster
- bootstrap.memory_lock=true - bootstrap.memory_lock=true
@ -29,7 +29,7 @@ services:
mode: 0600 mode: 0600
searchindexer: searchindexer:
image: nextcloud:29.0.1-fpm image: nextcloud:29.0.5-fpm
volumes: volumes:
- nextcloud:/var/www/html/ - nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached - nextapps:/var/www/html/custom_apps:cached

View File

@ -10,7 +10,7 @@ services:
- NEXTCLOUD_UPDATE=1 - NEXTCLOUD_UPDATE=1
db: db:
image: "postgres:12" image: "postgres:13"
command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}" command: -c "max_connections=${MAX_DB_CONNECTIONS:-100}"
volumes: volumes:
- "postgres:/var/lib/postgresql/data" - "postgres:/var/lib/postgresql/data"

View File

@ -1,7 +1,7 @@
version: "3.8" version: "3.8"
services: services:
web: web:
image: nginx:1.26.1 image: nginx:1.27.1
depends_on: depends_on:
- app - app
configs: configs:
@ -46,7 +46,7 @@ services:
start_period: 5m start_period: 5m
app: app:
image: nextcloud:29.0.1-fpm image: nextcloud:29.0.5-fpm
depends_on: depends_on:
- db - db
configs: configs:
@ -91,7 +91,7 @@ services:
failure_action: rollback failure_action: rollback
order: start-first order: start-first
labels: labels:
- "coop-cloud.${STACK_NAME}.version=8.0.0+29.0.1-fpm" - "coop-cloud.${STACK_NAME}.version=9.1.0+29.0.5-fpm"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "backupbot.backup=true" - "backupbot.backup=true"
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/" - "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
@ -103,7 +103,7 @@ services:
start_period: 15m start_period: 15m
cron: cron:
image: nextcloud:29.0.1-fpm image: nextcloud:29.0.5-fpm
volumes: volumes:
- nextcloud:/var/www/html/ - nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached - nextapps:/var/www/html/custom_apps:cached
@ -119,7 +119,7 @@ services:
cache: cache:
image: redis:7.2.5-alpine image: redis:7.4.0-alpine
networks: networks:
- internal - internal
volumes: volumes:

1
release/9.1.0+29.0.5-fpm Normal file
View File

@ -0,0 +1 @@
Added automated customization options. Config needs to be updated to be able to use it.