Skip to content

configure apps improvements #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
printminion-co merged 2 commits into from
Dec 5, 2024
Merged

configure apps improvements #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db73092
fix(configure.sh): don't return early during configuration of apps
bromiesTM Dec 5, 2024
0caf81e
fix: enforce new node_modules for building
bromiesTM Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ help: ## This help.
# thanks to https://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
.DEFAULT_GOAL := help

.remove_node_modules: ## Remove node_modules
rm -rf node_modules

build_mdi_svg: ## Build custom mdi svg
cd custom-npms/nc-mdi-svg && \
FONTAWESOME_PACKAGE_TOKEN=$(FONTAWESOME_PACKAGE_TOKEN) npm ci && \
Expand Down Expand Up @@ -124,5 +127,5 @@ zip_dependencies: ## Zip relevant files
build_release: build_nextcloud .build_deps add_config_partials zip_dependencies ## Build a release package (build apps/themes, copy configs and package)
echo "Everything done for a release"

build_locally: build_nextcloud .build_deps ## Build all apps/themes for local development
build_locally: .remove_node_modules build_nextcloud .build_deps ## Build all apps/themes for local development
echo "Everything done for local/dev"
24 changes: 14 additions & 10 deletions configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,19 @@ config_ui() {
ooc config:system:set defaultapp --value files
}

configure_app_nc_ionos_processes() {
echo "Configure nc_ionos_processes app"

if [ -z "${IONOS_PROCESSES_API_URL}" ] || [ -z "${IONOS_PROCESSES_USER}" ] || [ -z "${IONOS_PROCESSES_PASS}" ]; then
echo "\033[1;33mWarning: IONOS_PROCESSES_API_URL, IONOS_PROCESSES_USER or IONOS_PROCESSES_PASS not set, skipping configuration of nc_ionos_processes app\033[0m"
return
fi

ooc config:app:set --value "${IONOS_PROCESSES_API_URL}" --type string nc_ionos_processes ionos_mail_base_url
ooc config:app:set --value "${IONOS_PROCESSES_USER}" --type string nc_ionos_processes basic_auth_user
ooc config:app:set --value "${IONOS_PROCESSES_PASS}" --type string nc_ionos_processes basic_auth_pass
}

config_apps() {
echo "Configure apps ..."

Expand All @@ -60,17 +73,8 @@ config_apps() {
ooc config:app:set --value="no" core shareapi_only_share_with_group_members
ooc config:app:set --value='["admin"]' core shareapi_only_share_with_group_members_exclude_group_list

echo "Configure nc_ionos_processes app"
configure_app_nc_ionos_processes

if [ -z "${IONOS_PROCESSES_API_URL}" ] || [ -z "${IONOS_PROCESSES_USER}" ] || [ -z "${IONOS_PROCESSES_PASS}" ]; then
echo "Warning: IONOS_PROCESSES_API_URL, IONOS_PROCESSES_USER or IONOS_PROCESSES_PASS not set, skipping configuration of nc_ionos_processes app"
return
fi

ooc config:app:set --value "${IONOS_PROCESSES_API_URL}" --type string nc_ionos_processes ionos_mail_base_url
ooc config:app:set --value "${IONOS_PROCESSES_USER}" --type string nc_ionos_processes basic_auth_user
ooc config:app:set --value "${IONOS_PROCESSES_PASS}" --type string nc_ionos_processes basic_auth_pass

echo "Configure files app"
ooc config:app:set --value yes files crop_image_previews
ooc config:app:set --value yes files show_hidden
Expand Down
Loading