Merge claude/1
This commit is contained in:
commit
53c6b7fe1c
@ -136,7 +136,7 @@ installBookstack()
|
||||
else
|
||||
isSuccessful "Bookstack is online (HTTP ${bookstack_http_code})."
|
||||
|
||||
bookstack_create_output=$(sudo docker exec \
|
||||
bookstack_create_output=$(runFileOp docker exec \
|
||||
-e EZ_BS_NEW_EMAIL="$bookstack_target_email" \
|
||||
-e EZ_BS_NEW_PASS="$bookstack_target_pass" \
|
||||
bookstack sh -c 'cd /app/www && s6-setuidgid abc php artisan bookstack:create-admin --no-ansi --email="$EZ_BS_NEW_EMAIL" --name=Admin --password="$EZ_BS_NEW_PASS" 2>&1')
|
||||
@ -145,7 +145,7 @@ installBookstack()
|
||||
isSuccessful "Bookstack admin account created (email: $bookstack_target_email)."
|
||||
|
||||
if [[ "$bookstack_target_email" != "admin@admin.com" ]]; then
|
||||
sudo docker exec -i bookstack php /app/www/artisan tinker --no-ansi >/dev/null 2>&1 <<'PHP'
|
||||
runFileOp docker exec -i bookstack php /app/www/artisan tinker --no-ansi >/dev/null 2>&1 <<'PHP'
|
||||
$c = class_exists('\BookStack\Users\Models\User') ? '\BookStack\Users\Models\User' : '\BookStack\Auth\User';
|
||||
optional($c::where('email', 'admin@admin.com')->first())->delete();
|
||||
PHP
|
||||
|
||||
@ -62,8 +62,8 @@ installGitea()
|
||||
# that same value into the Prometheus scrape fragment so the two agree.
|
||||
if monitoringAppEnabled "$app_name"; then
|
||||
if [[ -n "$CFG_GITEA_METRICS_TOKEN" ]]; then
|
||||
sudo sed -i "s|GITEA_METRICS_TOKEN_PLACEHOLDER|${CFG_GITEA_METRICS_TOKEN}|g" \
|
||||
"$containers_dir$app_name/resources/monitoring/prometheus-scrape.yml"
|
||||
local result=$(runFileOp sed -i "s|GITEA_METRICS_TOKEN_PLACEHOLDER|${CFG_GITEA_METRICS_TOKEN}|g" \
|
||||
"$containers_dir$app_name/resources/monitoring/prometheus-scrape.yml")
|
||||
checkSuccess "Synced Gitea /metrics token to the Prometheus scrape config"
|
||||
else
|
||||
isNotice "CFG_GITEA_METRICS_TOKEN is empty — Gitea /metrics scrape may 401."
|
||||
|
||||
@ -85,7 +85,7 @@ installOwncloud()
|
||||
isNotice "Failed to retrieve the web page."
|
||||
fi
|
||||
|
||||
local result=$(sudo sed -i \
|
||||
local result=$(runFileOp sed -i \
|
||||
-e "s|OWNCLOUD_SETUP_VERSION|$owncloud_version|g" \
|
||||
-e "s|OWNCLOUD_SETUP_ADMIN_USERNAME|$CFG_OWNCLOUD_ADMIN_USERNAME|g" \
|
||||
-e "s|OWNCLOUD_SETUP_ADMIN_PASSWORD|$CFG_OWNCLOUD_ADMIN_PASSWORD|g" \
|
||||
|
||||
@ -84,7 +84,7 @@ installSearxng()
|
||||
# Check if the file was found or if we timed out
|
||||
if [ -f "$containers_dir$app_name/searxng-data/settings.yml" ]; then
|
||||
# Perform the required operation on the file once it exists
|
||||
local result=$(sudo sed -i "s/simple_style: auto/simple_style: $CFG_SEARXNG_THEME/" "$containers_dir$app_name/searxng-data/settings.yml")
|
||||
local result=$(runFileOp sed -i "s/simple_style: auto/simple_style: $CFG_SEARXNG_THEME/" "$containers_dir$app_name/searxng-data/settings.yml")
|
||||
checkSuccess "Changing from light mode to dark mode to avoid eye strain installs"
|
||||
|
||||
dockerComposeRestart $app_name;
|
||||
|
||||
@ -86,7 +86,7 @@ installTrilium()
|
||||
local trilium_counter=$((trilium_counter + 1))
|
||||
done
|
||||
|
||||
result=$(sudo sed -i "s|port=8080|port=$usedport1|g" "$containers_dir$app_name/trilium-data/config.ini")
|
||||
result=$(runFileOp sed -i "s|port=8080|port=$usedport1|g" "$containers_dir$app_name/trilium-data/config.ini")
|
||||
checkSuccess "Configured $app_name from default 8080 to $usedport1"
|
||||
|
||||
dockerComposeRestart $app_name;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user