From: <gre...@us...> - 2012-10-07 18:59:26
|
Revision: 43327 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43327&view=rev Author: gregmartin Date: 2012-10-07 18:59:20 +0000 (Sun, 07 Oct 2012) Log Message: ----------- Updated for 9.2beta1 Modified Paths: -------------- webdeploy/manifest.xml webdeploy/parameters.xml Modified: webdeploy/manifest.xml =================================================================== --- webdeploy/manifest.xml 2012-10-07 10:38:42 UTC (rev 43326) +++ webdeploy/manifest.xml 2012-10-07 18:59:20 UTC (rev 43327) @@ -8,18 +8,24 @@ removeCommandDelimiter="true" /> <!--ACLs for Tiki --> - <setAcl path="tiki/backups" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> - <setAcl path="tiki/db" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> - <setAcl path="tiki/dump" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> - <setAcl path="tiki/styles" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> - <setAcl path="tiki/whelp" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> - <setAcl path="tiki/temp" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> - <setAcl path="tiki/templates_c" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> - <setAcl path="tiki/templates" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> - <setAcl path="tiki/img/wiki" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> - <setAcl path="tiki/img/wiki_up" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> - <setAcl path="tiki/img/trackers" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> - <setAcl path="tiki/modules/cache" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> - + <!--Note: tiki/backups used for app backups. See parameter file --> + <setAcl path="tiki/db" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/dump" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/files" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/img/wiki" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/img/wiki_up" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/img/trackers" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/maps" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/mods" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/modules/cache" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/styles" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/temp" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/temp/cache" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/temp/public" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/temp/unified-index" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/templates_c" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/templates" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/tiki_tests/tests" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> + <setAcl path="tiki/whelp" setAclAccess="Modify" setAclUser="anonymousAuthenticationUser" /> </msdeploy.iisapp> Modified: webdeploy/parameters.xml =================================================================== --- webdeploy/parameters.xml 2012-10-07 10:38:42 UTC (rev 43326) +++ webdeploy/parameters.xml 2012-10-07 18:59:20 UTC (rev 43327) @@ -6,92 +6,148 @@ </parameter> <!--Set ACL parameters --> - <parameter name="SetAclParameter1" description="Sets the ACL on backups" defaultValue="{ApplicationPath}/backups" tags="Hidden"> - <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/backups$" /> - </parameter> - <parameter name="SetAclParameter2" description="Sets the ACL on db" defaultValue="{ApplicationPath}/db" tags="Hidden"> + + <parameter name="SetAclParameter1" description="Sets the ACL on db" defaultValue="{ApplicationPath}/db" tags="Hidden"> <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/db$" /> - </parameter> - <parameter name="SetAclParameter3" description="Sets the ACL on dump " defaultValue="{ApplicationPath}/dump" tags="Hidden"> + + <parameter name="SetAclParameter1" description="Sets the ACL on dump" defaultValue="{ApplicationPath}/dump" tags="Hidden"> <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/dump$" /> - </parameter> - <parameter name="SetAclParameter4" description="Sets the ACL on styles " defaultValue="{ApplicationPath}/styles" tags="Hidden"> - <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/styles$" /> - </parameter> - <parameter name="SetAclParameter5" description="Sets the ACL on whelp " defaultValue="{ApplicationPath}/whelp" tags="Hidden"> - <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/whelp$" /> - </parameter> - <parameter name="SetAclParameter6" description="Sets the ACL on temp " defaultValue="{ApplicationPath}/temp" tags="Hidden"> - <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/temp$" /> - </parameter> - <parameter name="SetAclParameter7" description="Sets the ACL on templates_c " defaultValue="{ApplicationPath}/templates_c" tags="Hidden"> - <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/templates_c$" /> - </parameter> - <parameter name="SetAclParameter8" description="Sets the ACL on templates " defaultValue="{ApplicationPath}/templates" tags="Hidden"> - <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/templates$" /> - </parameter> - <parameter name="SetAclParameter9" description="Sets the ACL on img/wiki" defaultValue="{ApplicationPath}/img/wiki" tags="Hidden"> + + <parameter name="SetAclParameter1" description="Sets the ACL on files" defaultValue="{ApplicationPath}/files" tags="Hidden"> + <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/files$" /> + + <parameter name="SetAclParameter1" description="Sets the ACL on img/wiki" defaultValue="{ApplicationPath}/img/wiki" tags="Hidden"> <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/img/wiki$" /> - </parameter> - <parameter name="SetAclParameter10" description="Sets the ACL on img/wiki_up" defaultValue="{ApplicationPath}/img/wiki_up" tags="Hidden"> + + <parameter name="SetAclParameter1" description="Sets the ACL on img/wiki_up" defaultValue="{ApplicationPath}/img/wiki_up" tags="Hidden"> <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/img/wiki_up$" /> - </parameter> - <parameter name="SetAclParameter11" description="Sets the ACL on img/trackers" defaultValue="{ApplicationPath}/img/trackers" tags="Hidden"> + + <parameter name="SetAclParameter1" description="Sets the ACL on img/trackers" defaultValue="{ApplicationPath}/img/trackers" tags="Hidden"> <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/img/trackers$" /> - </parameter> - <parameter name="SetAclParameter12" description="Sets the ACL on modules/cache " defaultValue="{ApplicationPath}/modules/cache" tags="Hidden"> + + <parameter name="SetAclParameter1" description="Sets the ACL on maps" defaultValue="{ApplicationPath}/maps" tags="Hidden"> + <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/maps$" /> + + <parameter name="SetAclParameter1" description="Sets the ACL on mods" defaultValue="{ApplicationPath}/mods" tags="Hidden"> + <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/mods$" /> + + <parameter name="SetAclParameter1" description="Sets the ACL on modules/cache" defaultValue="{ApplicationPath}/modules/cache" tags="Hidden"> <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/modules/cache$" /> - </parameter> - <parameter name="SetAclParameter13" description="Sets the ACL on admin" defaultValue="{ApplicationPath}/admin" tags="Hidden"> - <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/admin$" /> - </parameter> + <parameter name="SetAclParameter1" description="Sets the ACL on styles" defaultValue="{ApplicationPath}/styles" tags="Hidden"> + <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/styles$" /> + + <parameter name="SetAclParameter1" description="Sets the ACL on temp" defaultValue="{ApplicationPath}/temp" tags="Hidden"> + <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/temp$" /> + + <parameter name="SetAclParameter1" description="Sets the ACL on temp/cache" defaultValue="{ApplicationPath}/temp/cache" tags="Hidden"> + <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/temp/cache$" /> + + <parameter name="SetAclParameter1" description="Sets the ACL on temp/public" defaultValue="{ApplicationPath}/temp/public" tags="Hidden"> + <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/temp/public$" /> + + <parameter name="SetAclParameter1" description="Sets the ACL on temp/unified-index" defaultValue="{ApplicationPath}/temp/unified-index" tags="Hidden"> + <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/temp/unified-index$" /> + + <parameter name="SetAclParameter1" description="Sets the ACL on templates_c" defaultValue="{ApplicationPath}/templates_c" tags="Hidden"> + <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/templates_c$" /> + + <parameter name="SetAclParameter1" description="Sets the ACL on templates" defaultValue="{ApplicationPath}/templates" tags="Hidden"> + <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/templates$" /> + + <parameter name="SetAclParameter1" description="Sets the ACL on tiki_tests/tests" defaultValue="{ApplicationPath}/tiki_tests/tests" tags="Hidden"> + <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/tiki_tests/tests$" /> + + <parameter name="SetAclParameter1" description="Sets the ACL on whelp" defaultValue="{ApplicationPath}/whelp" tags="Hidden"> + <parameterEntry type="ProviderPath" scope="setAcl" match="tiki/whelp$" /> + + <!-- Database Parameters --> <!-- Prompts the user for the database server name.--> - <parameter name="Database Server" defaultValue="localhost" tags="MySQL,dbServer" > - <parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForServer" /> + <parameter name="Database Server" + defaultValue="localhost" + tags="MySQL,dbServer" > + <parameterEntry type="TextFile" + scope="install.sql" + match="PlaceHolderForServer" /> </parameter> - <parameter name="Automatic database server" defaultValue="$host_tiki='{Database Server}';" tags="Hidden,MySQL"> - <parameterEntry type="TextFile" scope="db\\local.php$" match="\$host_tiki[^;]*;" /> + + <parameter name="Automatic database server" + defaultValue="$host_tiki='{Database Server}';" + tags="Hidden,MySQL"> + <parameterEntry type="TextFile" + scope="db\\local.php$" + match="\$host_tiki[^;]*;" /> </parameter> <!-- Prompts the user for the database name. --> - <parameter name="Database Name" defaultValue="tikidb" tags="MySQL,dbName" > - <parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForDb" /> + <parameter name="Database Name" + defaultValue="tikidb" + tags="MySQL,dbName" > + <parameterEntry type="TextFile" + scope="install.sql" + match="PlaceHolderForDb" /> </parameter> - <parameter name="Automatic database name" defaultValue="$dbs_tiki='{Database Name}';" tags="Hidden,MySQL"> - <parameterEntry type="TextFile" scope="db\\local.php$" match="\$dbs_tiki[^;]*;" /> + + <parameter name="Automatic database name" + defaultValue="$dbs_tiki='{Database Name}';" + tags="Hidden,MySQL"> + <parameterEntry type="TextFile" + scope="db\\local.php$" + match="\$dbs_tiki[^;]*;" /> </parameter> <!--Prompts the user for the database admin username. --> - <parameter name="Database Administrator" defaultValue="root" tags="MySQL,DbAdminUsername" /> + <parameter name="Database Administrator" + defaultValue="root" + tags="MySQL,DbAdminUsername" /> <!-- Prompts the user for the database admin user's password. --> - <parameter name="Database Administrator Password" tags="Password,MySQL,DbAdminPassword" /> + <parameter name="Database Administrator Password" + tags="Password,MySQL,DbAdminPassword" /> <!-- Prompts the user for the database username --> - <parameter name="Database Username" defaultValue="tikiuser" tags="MySQL,DbUsername"> - <parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForUser" /> + <parameter name="Database Username" + defaultValue="tikiuser" + tags="MySQL,DbUsername"> + <parameterEntry type="TextFile" + scope="install.sql" + match="PlaceHolderForUser" /> </parameter> - <parameter name="Automatic database username" defaultValue="$user_tiki='{Database Username}';" tags="Hidden,MySQL"> - <parameterEntry type="TextFile" scope="db\\local.php$" match="\$user_tiki[^;]*;" /> + <parameter name="Automatic database username" + defaultValue="$user_tiki='{Database Username}';" + tags="Hidden,MySQL"> + <parameterEntry type="TextFile" + scope="db\\local.php$" + match="\$user_tiki[^;]*;" /> </parameter> <!-- Prompts for the database password --> - <parameter name="Database Password" tags="New,Password, MySQL, dbUserPassword"> - <parameterValidation type="RegularExpression" validationString="^(.){4,}$" /> + <parameter name="Database Password" + tags="New,Password, MySQL, dbUserPassword"> + <parameterValidation type="RegularExpression" + validationString="^(.){4,}$" /> <!-- Parameter substitution for SQL script files --> - <parameterEntry type="TextFile" scope="install.sql" match="PlaceHolderForPassword" /> + <parameterEntry type="TextFile" + scope="install.sql" + match="PlaceHolderForPassword" /> </parameter> - <parameter name="Automatic database password" defaultValue="$pass_tiki='{Database Password}';" tags="Hidden,MySQL"> - <parameterEntry type="TextFile" scope="db\\local.php$" match="\$pass_tiki[^;]*;" /> + <parameter name="Automatic database password" + defaultValue="$pass_tiki='{Database Password}';" + tags="Hidden,MySQL"> + <parameterEntry type="TextFile" + scope="db\\local.php$" + match="\$pass_tiki[^;]*;" /> </parameter> - <parameter name="Connection String" description="This is the connection string for the connection request." + <parameter name="Connection String" + description="This is the connection string for the connection request." defaultValue="uid={Database Administrator};Pwd={Database Administrator Password};Database={Database Name};Server={Database Server}" tags="MySQL, Hidden, Validate, MySQLConnectionString"> - <parameterEntry type="ProviderPath" scope="dbmysql" match="install.sql" /> + <parameterEntry type="ProviderPath" + scope="dbmysql" + match="install.sql" /> </parameter> </parameters> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |