Sovran_Systems/Sovran_SystemsOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #269 from naturallaw777/copilot/fix-nextcloud-wordpress-inactive-status

Browse Source 
Use canonical domain files for pre-existing Nextcloud/WordPress credentials and fix Nextcloud reset command
This commit is contained in:
Sovran_Systems
2026-04-17 07:21:22 -05:00
committed by GitHub
parent 7e0cda17f3 a1db5773fc
commit d2c9dd1fbd
2 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/nextcloud.nix
View File

@@ -217,33 +217,33 @@ CREDS
RemainAfterExit = true;
};
path = with pkgs; [ php coreutils gnused ];
path = with pkgs; [ coreutils gnused ];
script = ''
set -euo pipefail
CONFIG_FILE="/var/lib/www/nextcloud/config/config.php"
CREDS_FILE="/var/lib/secrets/nextcloud-admin"
DOMAIN_FILE="/var/lib/domains/nextcloud"
DOMAIN=""
DOMAIN="your-domain"
DOMAIN="$(php -r '$cfg = @include "/var/lib/www/nextcloud/config/config.php"; if (!is_array($cfg)) { exit(0); } $url = $cfg["overwrite.cli.url"] ?? ""; if (is_string($url) && $url !== "") { $host = parse_url($url, PHP_URL_HOST); if (is_string($host) && $host !== "") { echo $host; exit(0); } } $trusted = $cfg["trusted_domains"] ?? []; if (is_array($trusted)) { foreach ($trusted as $entry) { if (is_string($entry) && $entry !== "") { $entry = preg_replace("#^https?://#", "", $entry); $entry = preg_replace("#/.*$#", "", $entry); if ($entry !== "") { echo $entry; exit(0); } } } } if (is_string($trusted) && $trusted !== "") { $trusted = preg_replace("#^https?://#", "", $trusted); $trusted = preg_replace("#/.*$#", "", $trusted); echo $trusted; }' 2>/dev/null || true)"
if [ -f "$DOMAIN_FILE" ]; then
FILE_DOMAIN="$(sed -n '1{s/^[[:space:]]*//;s/[[:space:]]*$//;p;}' "$DOMAIN_FILE")"
if [ -n "$FILE_DOMAIN" ]; then
DOMAIN="$FILE_DOMAIN"
fi
fi
mkdir -p /var/lib/secrets /var/lib/domains
mkdir -p /var/lib/secrets
cat > "$CREDS_FILE" << CREDS
Nextcloud Existing Installation
═══════════════════════════════
URL: ''${DOMAIN:+https://$DOMAIN/}''${DOMAIN:-Unknown (set in $CONFIG_FILE)}
Note: Credentials were set before this flake.
Use existing credentials or reset via:
php /var/lib/www/nextcloud/occ user:resetpassword <admin-user>
Nextcloud (Pre-existing Installation)
═══════════════════════════════════════
URL: https://$DOMAIN/
Note: This Nextcloud was installed before Sovran_SystemsOS.
Use your existing admin credentials to log in.
Reset: sudo -u caddy php /var/lib/www/nextcloud/occ user:resetpassword <username>
CREDS
chmod 600 "$CREDS_FILE"
if [ -n "$DOMAIN" ] && [ ! -f "$DOMAIN_FILE" ]; then
printf '%s\n' "$DOMAIN" > "$DOMAIN_FILE"
fi
'';
};

37
modules/wordpress.nix
View File

@@ -180,42 +180,33 @@ CREDS
RemainAfterExit = true;
};
path = with pkgs; [ php wp-cli coreutils gnused shadow util-linux ];
path = with pkgs; [ coreutils gnused ];
script = ''
set -euo pipefail
CONFIG_FILE="/var/lib/www/wordpress/wp-config.php"
CREDS_FILE="/var/lib/secrets/wordpress-admin"
DOMAIN_FILE="/var/lib/domains/wordpress"
URL=""
DOMAIN=""
DOMAIN="your-domain"
URL="$(php -r '$cfg = @file_get_contents("/var/lib/www/wordpress/wp-config.php"); if ($cfg === false) { exit(0); } if (preg_match("/define\\(\\s*[\"\\x27]WP_HOME[\"\\x27]\\s*,\\s*[\"\\x27]([^\"\\x27]+)[\"\\x27]\\s*\\)/", $cfg, $m)) { echo $m[1]; exit(0); } if (preg_match("/define\\(\\s*[\"\\x27]WP_SITEURL[\"\\x27]\\s*,\\s*[\"\\x27]([^\"\\x27]+)[\"\\x27]\\s*\\)/", $cfg, $m)) { echo $m[1]; }' 2>/dev/null || true)"
if [ -z "$URL" ] && [ -f /var/lib/www/wordpress/wp-load.php ]; then
URL=$(/run/wrappers/bin/su -s /bin/sh caddy -c "cd /var/lib/www/wordpress && wp option get siteurl 2>/dev/null" || true)
if [ -f "$DOMAIN_FILE" ]; then
FILE_DOMAIN="$(sed -n '1{s/^[[:space:]]*//;s/[[:space:]]*$//;p;}' "$DOMAIN_FILE")"
if [ -n "$FILE_DOMAIN" ]; then
DOMAIN="$FILE_DOMAIN"
fi
fi
if [ -n "$URL" ]; then
DOMAIN="$(printf '%s' "$URL" | sed -E 's#^[A-Za-z][A-Za-z0-9+.-]*://##; s#/.*$##')"
fi
mkdir -p /var/lib/secrets /var/lib/domains
mkdir -p /var/lib/secrets
cat > "$CREDS_FILE" << CREDS
WordPress Existing Installation
═══════════════════════════════
URL: ''${URL:-Unknown (set in $CONFIG_FILE)}
Note: Credentials were set before this flake.
Use existing credentials or reset via:
wp user update <admin-user> --user_pass='<new-password>'
WordPress (Pre-existing Installation)
═══════════════════════════════════════
URL: https://$DOMAIN/wp-admin/
Note: This WordPress was installed before Sovran_SystemsOS.
Use your existing admin credentials to log in.
Reset: wp user update <username> --user_pass=<new-password>
CREDS
chmod 600 "$CREDS_FILE"
if [ -n "$DOMAIN" ] && [ ! -f "$DOMAIN_FILE" ]; then
printf '%s\n' "$DOMAIN" > "$DOMAIN_FILE"
fi
'';
};