Webtrees: use PHP CLI for initial setup instead of curl to setup wizard

ct/manyfold.sh

@@ -40,6 +40,8 @@ function update_script() {
     CURRENT_VERSION=$(grep -oP 'APP_VERSION=\K[^ ]+' /opt/manyfold/.env || echo "unknown")
     cp -r /opt/manyfold/app/storage /opt/manyfold_storage_backup 2>/dev/null || true
     cp -r /opt/manyfold/app/tmp /opt/manyfold_tmp_backup 2>/dev/null || true
+    cp /opt/manyfold/app/config/credentials.yml.enc /opt/manyfold_credentials.yml.enc 2>/dev/null || true
+    cp /opt/manyfold/app/config/master.key /opt/manyfold_master.key 2>/dev/null || true
     $STD tar -czf "/opt/manyfold_${CURRENT_VERSION}_backup.tar.gz" -C /opt/manyfold app
     msg_ok "Backed up Data"
 
@@ -55,12 +57,14 @@ function update_script() {
     RUBY_VERSION=${RUBY_INSTALL_VERSION} RUBY_INSTALL_RAILS="true" HOME=/home/manyfold setup_ruby
 
     msg_info "Restoring Data"
-    rm -rf /opt/manyfold/app/{storage,tmp}
+    rm -rf /opt/manyfold/app/{storage,tmp,config/credentials.yml.enc,config/master.key}
     cp -r /opt/manyfold_storage_backup /opt/manyfold/app/storage 2>/dev/null || true
     cp -r /opt/manyfold_tmp_backup /opt/manyfold/app/tmp 2>/dev/null || true
+    cp /opt/manyfold_credentials.yml.enc /opt/manyfold/app/config/credentials.yml.enc 2>/dev/null || true
+    cp /opt/manyfold_master.key /opt/manyfold/app/config/master.key 2>/dev/null || true
     chown -R manyfold:manyfold {/home/manyfold,/opt/manyfold}
     chown -R manyfold:manyfold /opt/manyfold/app/storage /opt/manyfold/app/tmp /opt/manyfold/app/config
-    rm -rf /opt/manyfold_storage_backup /opt/manyfold_tmp_backup
+    rm -rf /opt/manyfold_storage_backup /opt/manyfold_tmp_backup /opt/manyfold_credentials.yml.enc /opt/manyfold_master.key
     msg_ok "Restored Data"
 
     msg_info "Installing Manyfold"
@@ -76,8 +80,6 @@ function update_script() {
             bundle install
             corepack prepare '"$YARN_VERSION"' --activate
             corepack use '"$YARN_VERSION"'
-            rm -f config/credentials.yml.enc config/master.key
-            EDITOR=/bin/true bin/rails credentials:edit
             bin/rails db:migrate
             bin/rails assets:precompile
         '

install/webtrees-install.sh

@@ -47,23 +47,21 @@ systemctl enable -q --now php${PHP_VER}-fpm
 systemctl restart caddy
 
 msg_info "Automating Webtrees Setup"
-sleep 5
 WT_ADMIN_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c15)
-curl -sS -X POST "http://127.0.0.1/" \
+$STD sudo -u www-data php /opt/webtrees/index.php config-ini \
-  -d "step=6" \
+  --dbhost=127.0.0.1 \
-  --data-urlencode "baseurl=http://${LOCAL_IP}" \
+  --dbport=3306 \
-  -d "lang=en-US" \
+  --dbuser=webtrees \
-  -d "dbtype=mysql" \
+  --dbpass="${MARIADB_DB_PASS}" \
-  -d "dbhost=127.0.0.1" \
+  --dbname=webtrees \
-  -d "dbport=3306" \
+  --tblpfx=wt_ \
-  -d "dbuser=webtrees" \
+  --base-url="http://${LOCAL_IP}"
-  --data-urlencode "dbpass=${MARIADB_DB_PASS}" \
+$STD sudo -u www-data php /opt/webtrees/index.php user Admin \
-  -d "dbname=webtrees" \
+  --create \
-  -d "tblpfx=wt_" \
+  --real-name="Administrator" \
-  -d "wtname=Administrator" \
+  --email="admin@example.com" \
-  -d "wtuser=Admin" \
+  --password="${WT_ADMIN_PASS}"
-  --data-urlencode "wtpass=${WT_ADMIN_PASS}" \
+$STD sudo -u www-data php /opt/webtrees/index.php user-setting Admin canadmin 1
-  -d "wtemail=admin@example.com" >/dev/null
 
 cat <<EOF >>~/webtrees.creds