Compare commits
16 Commits
3f207a3612
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 4ab28370bc | |||
| c56aa70617 | |||
| 21553050f8 | |||
| f18664251e | |||
| 1a090dd8dc | |||
| 82f2af7e7a | |||
| bbfa923c9d | |||
|
|
58c70908c6 | ||
| 8827e5b324 | |||
|
|
a65651358a | ||
|
|
077ba03a3f | ||
|
|
271af99fad | ||
| f1fb4cd4ea | |||
| a827275995 | |||
| cd5a0f72de | |||
| 8029ebfb27 |
@@ -35,6 +35,7 @@ jobs:
|
||||
# =====================
|
||||
- name: Deploy to DEV via FTP
|
||||
if: github.ref == 'refs/heads/develop'
|
||||
shell: bash
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y lftp
|
||||
@@ -51,17 +52,68 @@ jobs:
|
||||
# =====================
|
||||
# PROD DEPLOY (FTP)
|
||||
# =====================
|
||||
- name: Deploy to PROD via FTP
|
||||
- name: Deploy to PROD via SSH
|
||||
if: github.ref == 'refs/heads/main'
|
||||
env:
|
||||
SSH_HOST: ${{ secrets.PROD_SSH_HOST }}
|
||||
SSH_USER: ${{ secrets.PROD_SSH_USER }}
|
||||
SSH_PORT: ${{ secrets.PROD_SSH_PORT }}
|
||||
SSH_KEY: ${{ secrets.PROD_SSH_PRIVATE_KEY }}
|
||||
HOST_WP_ROOT: ${{ secrets.PROD_HOST_WP_ROOT }}
|
||||
HOST_ABS_PLUGIN_PATH: ${{ secrets.PROD_HOST_ABS_PLUGIN_PATH }}
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
apt-get update
|
||||
apt-get install -y lftp
|
||||
# openssh-client to auth; tar for packaging with excludes
|
||||
apt-get install -y openssh-client tar
|
||||
|
||||
lftp -u "${{ secrets.FTP_USER }},${{ secrets.FTP_PASS }}" ftp://${{ secrets.FTP_HOST }}:${{ secrets.FTP_PORT }} <<EOF
|
||||
set ftp:ssl-allow no
|
||||
set net:timeout 20
|
||||
set net:max-retries 2
|
||||
set mirror:parallel-transfer-count 2
|
||||
mirror -R --delete --verbose ./ /httpdocs/wp-content/plugins/konficastle-workshopwahl/
|
||||
quit
|
||||
EOF
|
||||
# Prepare SSH key
|
||||
mkdir -p ~/.ssh
|
||||
# Write the multiline private key exactly as provided
|
||||
printf "%s\n" "$SSH_KEY" > ~/.ssh/prod_docker_key
|
||||
chmod 600 ~/.ssh/prod_docker_key
|
||||
|
||||
# Write SSH config so DOCKER_HOST can reference a named host
|
||||
cat > ~/.ssh/config <<CFG
|
||||
Host prod-docker
|
||||
HostName ${SSH_HOST}
|
||||
User ${SSH_USER}
|
||||
Port ${SSH_PORT}
|
||||
IdentityFile ~/.ssh/prod_docker_key
|
||||
IdentitiesOnly yes
|
||||
PubkeyAuthentication yes
|
||||
StrictHostKeyChecking accept-new
|
||||
CFG
|
||||
|
||||
# Prime known_hosts (optional, StrictHostKeyChecking accept-new will handle first connect)
|
||||
ssh-keyscan -p "$SSH_PORT" "$SSH_HOST" >> ~/.ssh/known_hosts || true
|
||||
|
||||
# Create a tarball with excludes to avoid copying VCS and CI folders
|
||||
TAR_FILE="/tmp/kc-plugin.tar.gz"
|
||||
tar -czf "$TAR_FILE" \
|
||||
--exclude .git \
|
||||
--exclude .gitea \
|
||||
--exclude .github \
|
||||
--exclude Notes \
|
||||
--exclude "*.yml" \
|
||||
--exclude "*.yaml" \
|
||||
--exclude "*.md" \
|
||||
.
|
||||
|
||||
# Choose target path: prefer absolute plugin path; otherwise derive from HOST_WP_ROOT
|
||||
if [ -n "${HOST_ABS_PLUGIN_PATH}" ]; then
|
||||
echo "Deploying to absolute host path: ${HOST_ABS_PLUGIN_PATH}"
|
||||
REMOTE_PATH_DECL="PLUGIN_PATH=\"${HOST_ABS_PLUGIN_PATH%/}\""
|
||||
elif [ -n "${HOST_WP_ROOT}" ]; then
|
||||
echo "Deploying to host path relative to remote home: \$HOME/${HOST_WP_ROOT%/}/wp-content/plugins/konficastle-workshopwahl"
|
||||
REMOTE_PATH_DECL="PLUGIN_PATH=\$HOME/${HOST_WP_ROOT%/}/wp-content/plugins/konficastle-workshopwahl"
|
||||
else
|
||||
echo "Error: set PROD_HOST_ABS_PLUGIN_PATH (absolute) or PROD_HOST_WP_ROOT (relative)" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Upload tarball to host home and extract
|
||||
scp -o StrictHostKeyChecking=accept-new -o IdentitiesOnly=yes -i ~/.ssh/prod_docker_key "$TAR_FILE" prod-docker:~/kc-plugin.tar.gz
|
||||
# Use \$HOME for remote expansion (tilde does not expand inside quotes)
|
||||
ssh prod-docker "$REMOTE_PATH_DECL; mkdir -p \"\$PLUGIN_PATH\" && rm -rf \"\$PLUGIN_PATH\"/* && tar -xzf \"\$HOME/kc-plugin.tar.gz\" -C \"\$PLUGIN_PATH\" && rm -f \"\$HOME/kc-plugin.tar.gz\" && ls -la \"\$PLUGIN_PATH\" | head -n 50"
|
||||
|
||||
16
CHANGELOG.md
16
CHANGELOG.md
@@ -1,16 +0,0 @@
|
||||
# Changelog
|
||||
|
||||
All notable changes to this project are documented in this file.
|
||||
|
||||
## [1.0] - 2026-02-01
|
||||
### Added
|
||||
- Initial release of the KonfiCastle Workshop-Wahlen plugin (Admin backend, participant frontend, assignment logic, CSV export, teamer password management).
|
||||
- Shortcodes: `[konficastle_workshopwahl wahl=ID]`, `[konficastle_workshop_ergebnis wahl=ID]`.
|
||||
|
||||
### Fixed
|
||||
- Removed query against non-existent table `kc_phasen`; phases are derived from `kc_wahlen.anzahl_einheiten`. See [includes/admin-workshops.php](includes/admin-workshops.php).
|
||||
- Initialized `$debug_output` to prevent PHP warning in frontend. See [includes/frontend-form.php](includes/frontend-form.php).
|
||||
|
||||
### Notes
|
||||
- Database tables use WordPress prefix via `$wpdb->prefix`.
|
||||
- Force assignments have priority over automatic allocation.
|
||||
@@ -47,8 +47,3 @@ Dieses WordPress-Plugin ermöglicht die Verwaltung und Durchführung von Worksho
|
||||
---
|
||||
|
||||
Für Detailfragen zu Datenbankstruktur, Shortcodes oder Zuteilungslogik siehe die jeweiligen Dateien im `includes/`-Verzeichnis.
|
||||
|
||||
## Release Notes
|
||||
|
||||
Siehe die ausführlichen Hinweise zur Version 1.0 in [RELEASE_NOTES.md](RELEASE_NOTES.md).
|
||||
|
||||
|
||||
@@ -360,9 +360,9 @@ function kc_wahlen_page() {
|
||||
echo '<td class="kc-actions">';
|
||||
echo '<a class="kc-btn" href="?page=kc_wahlen&zuweisen='.intval($wahl->id).'">Workshops zuweisen</a>';
|
||||
echo '<a class="kc-btn" href="?page=kc_wahlen&edit_wahl='.intval($wahl->id).'">Bearbeiten</a>';
|
||||
echo '<a class="kc-btn" href="?page=kc_wahlen&show_zuteilung='.intval($wahl->id).'">Zuteilung anzeigen</a>';
|
||||
$nonce = wp_create_nonce('kc_run_zuteilung_' . intval($wahl->id));
|
||||
echo '<a class="kc-btn" href="?page=kc_wahlen&run_zuteilung='.intval($wahl->id).'&_wpnonce='.$nonce.'" onclick="return confirm(\'Zuteilung wirklich starten? Dies überschreibt vorhandene Zuteilungen.\');">Zuteilung starten</a>';
|
||||
echo '<a class="kc-btn" href="?page=kc_wahlen&show_zuteilung='.intval($wahl->id).'">Zuteilung anzeigen</a>';
|
||||
echo '<a href="?page=kc_wahlen&delete_wahl='.intval($wahl->id).'" class="kc-btn del" onclick="return confirm(\'Wirklich löschen?\');">Löschen</a>';
|
||||
echo '</td>';
|
||||
echo '</tr>';
|
||||
|
||||
@@ -3,6 +3,7 @@ if (!defined('ABSPATH')) exit;
|
||||
|
||||
/**
|
||||
* Create plugin database tables on activation and remove them on deactivation.
|
||||
|
||||
*/
|
||||
function kc_install_tables() {
|
||||
global $wpdb;
|
||||
|
||||
Reference in New Issue
Block a user