Commit 50a68fe1 authored by Mathias Goebel's avatar Mathias Goebel 🎠
Browse files

Merge branch 'release/1.1.6'

parents 76095314 b4f62ec0
project.version=1.1.5
project.version=1.1.6
......@@ -101,7 +101,7 @@ declare variable $moveProject := (
xmldb:move("/db/apps/fontane/system/autostart", "/db/system")
);
declare variable $configdoc := doc( "/db/sade-projects/textgrid/config.xml" );
declare variable $preconfigdoc := doc( "/db/sade-projects/textgrid/config.xml" );
declare variable $credentials :=
file:read("/var/lib/textgrid/fontane/credentials.txt")
=> tokenize("\n");
......@@ -109,14 +109,17 @@ declare variable $credentialInjection :=
for $line at $pos in $credentials
return
switch ($pos)
case 1 return update replace $configdoc//param[@key="textgrid.user"]/text() with text {$line}
case 2 return update replace $configdoc//param[@key="textgrid.password"]/text() with text {$line}
case 1 return update replace $preconfigdoc//param[@key="textgrid.user"]/text() with text {$line}
case 2 return update replace $preconfigdoc//param[@key="textgrid.password"]/text() with text {$line}
case 3 return (
(update replace $configdoc//param[@key="secret"]/text() with text {$line}),
(update replace $configdoc//param[@key="sade.password"]/text() with text {$line}))
case 4 return update replace $configdoc//param[@key="dokuwiki.user"]/text() with text {$line}
case 5 return update replace $configdoc//param[@key="dokuwiki.password"]/text() with text {$line}
(update replace $preconfigdoc//param[@key="secret"]/text() with text {$line}),
(update replace $preconfigdoc//param[@key="sade.password"]/text() with text {$line}))
case 4 return update replace $preconfigdoc//param[@key="dokuwiki.user"]/text() with text {$line}
case 5 return update replace $preconfigdoc//param[@key="dokuwiki.password"]/text() with text {$line}
default return false();
declare variable $configdoc := doc( "/db/sade-projects/textgrid/config.xml" );
(:
the security manager is not available during autodeployment
declare variable $SetAdminPw := sm:passwd("admin", string($configdoc//param[@key="secret"]/text()));
......@@ -125,7 +128,8 @@ declare variable $config := map:new(for $param in $configdoc/config/param
return map:entry(string($param/@key), string($param))
);
declare variable $test := util:log-system-out("webauth: "||$config("textgrid.webauth"));
declare variable $testone := util:log-system-out("webauth: "||$config("textgrid.webauth"));
declare variable $testtwo := util:log-system-out("webauth: "||$configdoc//param[@key="textgrid.webauth"]/string(.));
declare variable $sid :=
tgclient:getSid(
......
<?xml version="1.0" encoding="UTF-8"?>
<div>
<xhtml:p xmlns:xhtml="http://www.w3.org/1999/xhtml">
[Teil I der <xhtml:a href="?id=gesamtdokumentation">Gesamtdokumentation</xhtml:a>]
</xhtml:p>
<xhtml:p xmlns:xhtml="http://www.w3.org/1999/xhtml">
<xhtml:p>
<xhtml:div class="note">important: Baustelle
</xhtml:div>
</xhtml:p>
</xhtml:p>
<xhtml:h2 xmlns:xhtml="http://www.w3.org/1999/xhtml">
<div class="block-header">
<h2>
<span class="title">I. Hinweise zur Benutzung des Fontane-Notizbuch-Portals</span>
<span class="decoration"/>
<span class="decoration"/>
<span class="decoration"/>
</h2>
<div id="toggleToc">
<i class="fa fa-caret-down" aria-hidden="true"/>
</div>
<div id="dokuToc"/>
</div>
</xhtml:h2>
<xhtml:div xmlns:xhtml="http://www.w3.org/1999/xhtml">
</xhtml:div>
</div>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment