vex2: update data transfer script

diff --git a/ansible/roles/web/dokuwiki/files/transfer_dokuwiki_vex1_data_to_vex2.sh b/ansible/roles/web/dokuwiki/files/transfer_dokuwiki_vex1_data_to_vex2.sh
new file mode 100755 (executable)
index 0000000..c93d636
--- /dev/null
+++ b/ansible/roles/web/dokuwiki/files/transfer_dokuwiki_vex1_data_to_vex2.sh
@@ -0,0 +1,37 @@
+#!/bin/zsh
+ssh-add ~/.ssh/id-rsa
+
+echo ""
+echo "=========== Rsyncing Dokuwiki Data from vex  ======================================"
+rsync -e 'ssh -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa -o KexAlgorithms=curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1,diffie-hellman-group1-sha1' -v -r --size-only --chown dokuwiki:dokuwiki vex.realraum.at:/var/www/dokuwiki/data/ /srv/dokuwiki/data/
+echo ""
+echo "=========== Rsyncing Dokuwiki ACL+Users from vex  ======================================"
+rsync -e 'ssh -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa -o KexAlgorithms=curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1,diffie-hellman-group1-sha1' -v -r --size-only --chown dokuwiki:dokuwiki vex.realraum.at:/var/www/dokuwiki/conf/acl.auth.php vex.realraum.at:/var/www/dokuwiki/conf/users.auth.php /srv/dokuwiki/acl/
+
+## Fixes for newer plugins
+echo ""
+echo "=========== Applying sed fixes to pages necessary due to plugins updates ======================================"
+sed 's/<faicon.*fa-\(.*\)>/{{fa>\1}}/' -i /srv/dokuwiki/data/pages/navbar.txt
+sed '/^{{rss/d' -i /srv/dokuwiki/data/pages/realraum.txt
+sed 's|<script type="text/javascript" src="/kiosk.js"></script>|script type="text/javascript" src="//status.realraum.at/js/jquery/jquery.min.js"></script><script type="text/javascript" src="//status.realraum.at/kiosk.js"></script>|' -i /srv/dokuwiki/data/pages/r3sidebar.txt 
+
+
+echo ""
+echo "=========== Converting Markdown Pages with Pandoc  ======================================"
+for f in /srv/dokuwiki/data/pages/**/*.md.txt; do
+       echo "  converting $f to ${f:r:r}.txt"
+       pandoc --from markdown "$f" -t dokuwiki -o "${f:r:r}.txt" && rm "$f"
+done
+
+echo ""
+echo "=========== Converting Pages containing <markdown> with Pandoc  ======================================"
+for mdcf in $(grep -l '</markdown>' /srv/dokuwiki/data/pages/**/*.txt); do
+       echo "  convertig $mdcf"
+       TF=$(mktemp)
+       mv "$mdcf" "$TF"
+       awk '
+    /<markdown>/ { in_block = 1; next }
+    /<\/markdown>/ { in_block = 0; close("pandoc --from markdown --to dokuwiki"); next }
+    in_block { print | "pandoc --from markdown --to dokuwiki"; next }
+    { print } ' "$TF" >| "$mdcf"
+done

diff --git a/ansible/roles/web/dokuwiki/templates/transfer_dokuwiki_vex1_data_to_vex2.sh b/ansible/roles/web/dokuwiki/templates/transfer_dokuwiki_vex1_data_to_vex2.sh
deleted file mode 100755 (executable)
index 353c491..0000000
--- a/ansible/roles/web/dokuwiki/templates/transfer_dokuwiki_vex1_data_to_vex2.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/zsh
-rsync -e 'ssh -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa -o KexAlgorithms=curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1,diffie-hellman-group1-sha1' -v -r --size-only --chown dokuwiki:dokuwiki vex.realraum.at:/var/www/dokuwiki/data/ /srv/dokuwiki/data/
-rsync -e 'ssh -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa -o KexAlgorithms=curve25519-sha256@libssh.org,ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,diffie-hellman-group-exchange-sha256,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1,diffie-hellman-group1-sha1' -v -r --size-only --chown dokuwiki:dokuwiki vex.realraum.at:/var/www/dokuwiki/conf/acl.auth.php vex.realraum.at:/var/www/dokuwiki/conf/users.auth.php /srv/dokuwiki/acl/
-
-## Fixes for newer plugins
-sed 's/<faicon.*fa-\(.*\)>/{{fa>\1}}/' -i /srv/dokuwiki/data/pages/navbar.txt
-sed '/^{{rss/d' -i /srv/dokuwiki/data/pages/realraum.txt
-sed 's|<script type="text/javascript" src="/kiosk.js"></script>|script type="text/javascript" src="//status.realraum.at/js/jquery/jquery.min.js"></script><script type="text/javascript" src="//status.realraum.at/kiosk.js"></script>|' -i /srv/dokuwiki/data/pages/r3sidebar.txt 
-
-## Todo
-# - markdown conversion with pandoc
-
-for f in /srv/dokuwiki/data/pages/**/*.md.txt; do pandoc --from markdown "$f" -t dokuwiki -o "${f:r:r}.txt" && rm "$f"; done
-