Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrobocoder <anthon.pang@gmail.com>2011-03-11 21:42:24 +0300
committerrobocoder <anthon.pang@gmail.com>2011-03-11 21:42:24 +0300
commitc56987b8488560b6c719f832d00dc64c1b00519c (patch)
tree8afbd9c747e80d22307cf431e8fa5dd0516893c3 /misc/package
parent29ba4e253bab56af4ce41d85d9aeac8884d9bd17 (diff)
refs #2176 - update WAG config
git-svn-id: http://dev.piwik.org/svn/trunk@4065 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'misc/package')
-rw-r--r--misc/package/WebAppGallery/Manifest.xml4
-rw-r--r--misc/package/WebAppGallery/install.sql2
-rw-r--r--misc/package/WebAppGallery/parameters.xml18
3 files changed, 12 insertions, 12 deletions
diff --git a/misc/package/WebAppGallery/Manifest.xml b/misc/package/WebAppGallery/Manifest.xml
index a252383bb2..4efbb6b361 100644
--- a/misc/package/WebAppGallery/Manifest.xml
+++ b/misc/package/WebAppGallery/Manifest.xml
@@ -7,7 +7,7 @@
/>
<dbmysql
path="install.sql"
- commandDelimeter="//"
- removeCommandDelimeter="true"
+ commandDelimiter="//"
+ removeCommandDelimiter="true"
/>
</MSDeploy.iisApp>
diff --git a/misc/package/WebAppGallery/install.sql b/misc/package/WebAppGallery/install.sql
index 8a751dca8c..bd8cc7e7c8 100644
--- a/misc/package/WebAppGallery/install.sql
+++ b/misc/package/WebAppGallery/install.sql
@@ -5,7 +5,7 @@ DROP PROCEDURE IF EXISTS add_user ;
CREATE PROCEDURE add_user()
BEGIN
DECLARE EXIT HANDLER FOR 1044 BEGIN END;
-GRANT ALL PRIVILEGES ON PlaceholderForDbName.* to 'PlaceholderForDbUser'@'PlaceholderForServer' IDENTIFIED BY 'PlaceholderForDbPassword';
+GRANT ALL PRIVILEGES ON PlaceholderForDbName.* to 'PlaceholderForDbUsername'@'PlaceholderForServer' IDENTIFIED BY 'PlaceholderForDbPassword';
FLUSH PRIVILEGES;
END
//
diff --git a/misc/package/WebAppGallery/parameters.xml b/misc/package/WebAppGallery/parameters.xml
index cf553f3e90..71fc0e639b 100644
--- a/misc/package/WebAppGallery/parameters.xml
+++ b/misc/package/WebAppGallery/parameters.xml
@@ -32,7 +32,7 @@
tags="MySQL,dbServer">
<parameterEntry
type="TextFile"
- scope="install.sql$"
+ scope="install.sql"
match="PlaceholderForServer"
/>
</parameter>
@@ -42,7 +42,7 @@
tags="Hidden, MySQL">
<parameterEntry
type="TextFile"
- scope="config\\config.ini.php$"
+ scope="config\\config.ini.php"
match="host\s*=\s*[^\r\n]*"
/>
</parameter>
@@ -58,7 +58,7 @@
/>
<parameterEntry
type="TextFile"
- scope="install.sql$"
+ scope="install.sql"
match="PlaceholderForDbName"
/>
</parameter>
@@ -68,7 +68,7 @@
tags="Hidden, MySQL">
<parameterEntry
type="TextFile"
- scope="config\\config.ini.php$"
+ scope="config\\config.ini.php"
match="dbname\s*=\s*[^\r\n]*"
/>
</parameter>
@@ -84,7 +84,7 @@
/>
<parameterEntry
type="TextFile"
- scope="install.sql$"
+ scope="install.sql"
match="PlaceholderForDbUsername"
/>
</parameter>
@@ -94,7 +94,7 @@
tags="Hidden,MySQL">
<parameterEntry
type="TextFile"
- scope="config\\config.ini.php$"
+ scope="config\\config.ini.php"
match="username\s*=\s*[^\r\n]*"
/>
</parameter>
@@ -110,7 +110,7 @@
/>
<parameterEntry
type="TextFile"
- scope="install.sql$"
+ scope="install.sql"
match="PlaceholderForDbPassword"
/>
</parameter>
@@ -120,7 +120,7 @@
tags="Hidden, MySQL">
<parameterEntry
type="TextFile"
- scope="config\\config.ini.php$"
+ scope="config\\config.ini.php"
match="password\s*=(.{6,20})&quot;"
/>
</parameter>
@@ -158,7 +158,7 @@
tags="Hidden, MySQL">
<parameterEntry
type="TextFile"
- scope="config\\config.ini.php$"
+ scope="config\\config.ini.php"
match="adapter\s*=\s*[^\r\n]*"
/>
</parameter>