From 70d2af523cf495a41ad1ef5a40ec56c7362e59e2 Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Mon, 19 Dec 2016 00:37:50 +0200
Subject: [PATCH] Fixed documentation dumping scripts.

Dumped documentation is not stored in the repository, it would just bloat it.

refs #6848
---
 releng/doc/dump-mysql-db.sh | 18 ++++++++++++++
 releng/doc/dump-wikis.sh    | 21 ++++++++++++++++
 releng/doc/release.html     | 15 +++++-------
 releng/doc/release.md       | 11 ++++-----
 releng/doc/tag-dev-wiki.sh  | 47 -----------------------------------
 releng/doc/tag-wiki.sh      | 49 -------------------------------------
 releng/doc/tag.sh           |  5 ----
 7 files changed, 50 insertions(+), 116 deletions(-)
 create mode 100755 releng/doc/dump-mysql-db.sh
 create mode 100755 releng/doc/dump-wikis.sh
 delete mode 100644 releng/doc/tag-dev-wiki.sh
 delete mode 100644 releng/doc/tag-wiki.sh
 delete mode 100644 releng/doc/tag.sh
diff --git a/releng/doc/dump-mysql-db.sh b/releng/doc/dump-mysql-db.sh
new file mode 100755
index 000000000..271eb42c1
--- /dev/null
+++ b/releng/doc/dump-mysql-db.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+major=$1
+minor=$2
+service=$3
+wikidb=$4
+wikidbusr=$5
+
+srcdb=${wikidb}
+srcdbusr=${wikidbusr}
+tgtdb=${wikidb}_${major}_${minor}_${service}
+
+echo "Dumping database ${srcdb} to ${tgtdb} as user ${srcdbusr}"
+echo "Press enter to continue or C-c to cancel"
+read foo
+
+echo "Dumping $srcdb"
+mysqldump -u ${srcdbusr} -p ${srcdb} > ${tgtdb}.dump
diff --git a/releng/doc/dump-wikis.sh b/releng/doc/dump-wikis.sh
new file mode 100755
index 000000000..ae2a64dc3
--- /dev/null
+++ b/releng/doc/dump-wikis.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+
+major=1
+minor=25
+service=0
+ver=${major}.${minor}.${service}
+
+mkdir ${ver}
+cd ${ver}
+OLDIFS=$IFS
+IFS=','
+for db in enduserwikidb,enduserwikiuser devwikidb,devwikiuser; do
+	set $db
+	sh ../dump-mysql-db.sh ${major} ${minor} ${service} ${1} ${2}
+done
+IFS=$OLDIFS
+
+cd ..
+tar zcvf ${ver}.tar.gz ${ver}
+rm -rf ${ver}
diff --git a/releng/doc/release.html b/releng/doc/release.html
index 0708ef4c3..126c76cd8 100644
--- a/releng/doc/release.html
+++ b/releng/doc/release.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>MarkdownPad Document</title>
+<title>release</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <style type="text/css">
 /* GitHub stylesheet for MarkdownPad (http://markdownpad.com) */
@@ -441,14 +441,11 @@ git push origin --tags
 <p>Note The -m argument must be supplied to create an <a href="https://git-scm.com/book/en/v2/Git-Basics-Tagging">annotated tag</a>.
 Only annotated or signed tags can be pushed to Gerrit.</p>
 </blockquote>
-<h2>Tag documentation wikis</h2>
-<p>Tag documentation wiki using <a href="./tag.sh">tag.sh</a> script.</p>
-<p>The wiki documentation is mainly in MediaWiki installations. The only sane way to tag the documentation is to clone it:</p>
-<ul>
-<li>Copy the wiki installation from wiki to ${release_version}/wiki</li>
-<li>Copy the trunk wiki MySQL database into a new version</li>
-<li>Reconfigure the tagged wiki (LocalSettings.php) to use the copied database and no longer allow any edits</li>
-</ul>
+<h2>Dump documentation wikis</h2>
+<p>Dump documentation wiki using <a href="./dump-wikis.sh">dump-wikis.sh</a> script.</p>
+<p>The wiki documentation is mainly in MediaWiki installations. The only
+sane way to tag the documentation is to back up the mysql database
+backing the wiki.</p>
 <h2>Compile change log entry</h2>
 <ul>
 <li>Edit the <a href="https://www.simantics.org/redmine/projects/simantics-platform/wiki/ChangeLog">main page</a> and add a a link for release x.y.z[.w].</li>
diff --git a/releng/doc/release.md b/releng/doc/release.md
index b21bbeec5..23badbcf4 100644
--- a/releng/doc/release.md
+++ b/releng/doc/release.md
@@ -132,14 +132,13 @@ When the release branches are ready for the release, tag them with the tag `vx.y
 > Note The -m argument must be supplied to create an [annotated tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging).
 > Only annotated or signed tags can be pushed to Gerrit.
 
-## Tag documentation wikis
+## Dump documentation wikis
 
-Tag documentation wiki using [tag.sh](./tag.sh) script.
+Dump documentation wiki using [dump-wikis.sh](./dump-wikis.sh) script.
 
-The wiki documentation is mainly in MediaWiki installations. The only sane way to tag the documentation is to clone it:
-* Copy the wiki installation from wiki to ${release_version}/wiki
-* Copy the trunk wiki MySQL database into a new version
-* Reconfigure the tagged wiki (LocalSettings.php) to use the copied database and no longer allow any edits
+The wiki documentation is mainly in MediaWiki installations. The only
+sane way to tag the documentation is to back up the mysql database
+backing the wiki.
 
 ## Compile change log entry
 
diff --git a/releng/doc/tag-dev-wiki.sh b/releng/doc/tag-dev-wiki.sh
deleted file mode 100644
index 8a53258b8..000000000
--- a/releng/doc/tag-dev-wiki.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-major=$1
-minor=$2
-www=/var/www
-wikiname=http-dev.simantics.org
-wikidb=devwikidb
-wikidbuser=devwikiuser
-
-releasewww=${www}/${major}.${minor}
-
-srcdb=${wikidb}
-tgtdb=${wikidb}_${major}_${minor}
-
-echo "Release version: $major.$minor"
-
-function myexecute() {
-        echo "Sending to mysql using database $1: $2"
-        echo $2 | mysql -u root -p $1
-}
-
-# dump wiki db to file
-echo "Dumping $srcdb"
-mysqldump -p ${srcdb} > ${tgtdb}.dump
-# load wiki db from file to name ${wikidb}_x_y, where x_y are major.minor version numbers
-# add privileges for ${wikidbuser} to ${wikidb}_x_y
-echo "Importing ${tgtdb}"
-cat > import_${major}_${minor}.sql <<EOF
-drop database ${tgtdb};
-create database ${tgtdb};
-grant all privileges on $tgtdb.* to '${wikidbuser}'@'localhost';
-grant all privileges on $tgtdb.* to '${wikidbuser}'@'%';
-use $tgtdb;
-source ${tgtdb}.dump;
-EOF
-myexecute $srcdb "source import_${major}_${minor}.sql;"
-
-# copy /var/www/http-dev.simantics.org/ to /var/www/http-dev.simantics.org/x.y/wiki
-echo "Copying wiki www-directory $www to $releasewww"
-mkdir -p ${releasewww}
-cp -a ${www}/${wikiname} ${releasewww}
-
-# change /var/www/https-www.simantics.org/x.y/wiki/LocalSettings.php to use simwikidb_x_y
-echo "Fixing released wiki settings"
-cat $www/$wikiname/LocalSettings.php | sed -e "s/$srcdb/$tgtdb/" |sed -e "s/\/${wikiname}/\/$major\.$minor\/${wikiname}/"> $releasewww/${wikiname}/LocalSettings.php
-echo '$wgReadOnly = "Released version, no further changes allowed.";' >> $releasewww/${wikiname}/LocalSettings.php
-
diff --git a/releng/doc/tag-wiki.sh b/releng/doc/tag-wiki.sh
deleted file mode 100644
index 14eec0c92..000000000
--- a/releng/doc/tag-wiki.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-major=$1
-minor=$2
-www=$3
-#www=/var/www/https-www.simantics.org
-wikiname=$4
-#wikiname=wiki
-wikidb=$5
-wikidbuser=$6
-
-releasewww=${www}/${major}.${minor}
-
-srcdb=${wikidb}
-tgtdb=${wikidb}_${major}_${minor}
-
-echo "Release version: $major.$minor"
-
-function myexecute() {
-        echo "Sending to mysql using database $1: $2"
-        echo $2 | mysql -u root -p $1
-}
-
-# dump wiki db to file
-echo "Dumping $srcdb"
-mysqldump -p ${srcdb} > ${tgtdb}.dump
-# load wiki db from file to name ${wikidb}_x_y, where x_y are major.minor version numbers
-# add privileges for ${wikidbuser} to ${wikidb}_x_y
-echo "Importing ${tgtdb}"
-cat > import_${major}_${minor}.sql <<EOF
-drop database if exists ${tgtdb};
-create database ${tgtdb};
-grant all privileges on $tgtdb.* to '${wikidbuser}'@'localhost';
-grant all privileges on $tgtdb.* to '${wikidbuser}'@'%';
-use $tgtdb;
-source ${tgtdb}.dump;
-EOF
-myexecute $srcdb "source import_${major}_${minor}.sql;"
-
-# copy /var/www/https-www.simantics.org/wiki to /var/www/https-www.simantics.org/x.y/wiki
-echo "Copying wiki www-directory $www to $releasewww"
-mkdir -p ${releasewww}
-cp -a ${www}/${wikiname} ${releasewww}/${wikiname}
-
-# change /var/www/https-www.simantics.org/x.y/wiki/LocalSettings.php to use simwikidb_x_y
-echo "Fixing released wiki settings"
-cat $www/$wikiname/LocalSettings.php | sed -e "s/$srcdb/$tgtdb/" |sed -e "s/\/${wikiname}/\/$major\.$minor\/${wikiname}/"> $releasewww/${wikiname}/LocalSettings.php
-echo '$wgReadOnly = "Released version, no further changes allowed.";' >> $releasewww/${wikiname}/LocalSettings.php
-
diff --git a/releng/doc/tag.sh b/releng/doc/tag.sh
deleted file mode 100644
index 74297df28..000000000
--- a/releng/doc/tag.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-./tag-wiki.sh 1 4 /var/www/https-www.simantics.org end_user_wiki enduserwikidb enduserwikiuser
-#./tag-dev-wiki.sh 1 4
-
-- 
2.43.2

