Mglaser has uploaded a new change for review. https://gerrit.wikimedia.org/r/117172
Change subject: Updated to MW1.22.0 ...................................................................... Updated to MW1.22.0 Changelog * Updated the core to 1.22.0. * Updated the WindowsAzureSDK and WindowsAzureStorage extensions to the * latest version. * Fixed a bug with parameter type in AzureFileBackendList class constructor in WindowsAzureStorage extension. * Changed web deploy parameter names to user friendly names. * Added few validations for web deploy parameters. * Removed the azure host parameter since it is not required in the latest extension. * Changed the values of "Enable MediaWiki file upload" and "Use Windows Azure storage as file backend" parameters to Yes/No instead of True/False. * The "mw-config/index.php" file will be replaced with the default file (WebInstaller) after installation. Since command line is not available in Windows Azure websites, this will help the users to upgrade MediaWiki using the upgrade key through browser. * The WpiSettings.php file will be deleted once the installation is completed. This is a package release, thanks to Pravin Deshmukh Change-Id: Ia75ac6170bb85d17fe79495c02c183a908adeb5b --- A configuration-1.22.0/TBEX.xml A configuration-1.22.0/WpiSettings.php A configuration-1.22.0/install.sql A configuration-1.22.0/manifest.xml A configuration-1.22.0/mw-config/index.php A configuration-1.22.0/parameters.xml A mediawiki-1.22.0-IIS.zip 7 files changed, 763 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/packages/WPI refs/changes/72/117172/1 diff --git a/configuration-1.22.0/TBEX.xml b/configuration-1.22.0/TBEX.xml new file mode 100644 index 0000000..f0270ed --- /dev/null +++ b/configuration-1.22.0/TBEX.xml @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="utf-8"?> +<WebPlatform> + <Links> + <AddLink InDashboard="True"> + <Title>Start Here</Title> + <Description>Complete MediaWiki Installation.</Description> + <Uri>/index.php</Uri> + <ImageUri>http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png</ImageUri> + </AddLink> + <AddLink InDashboard="True" InLearn="True"> + <Title>About MediaWiki</Title> + <Description>MediaWiki is a free software open source wiki package written in PHP, originally for use on Wikipedia. It is now used by several other projects of the non-profit Wikimedia Foundation and by many other wikis, including this website.</Description> + <Uri>http://www.mediawiki.org/wiki/MediaWiki</Uri> + <ImageUri>http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png</ImageUri> + </AddLink> + <AddLink InDashboard="True" InLearn="True"> + <Title>System admin hub - Everything for the system administrator.</Title> + <Description>This is a place for system administrators to get help installing, upgrading, configuring or maintaining the MediaWiki software on a third-party wiki..</Description> + <Uri>http://www.mediawiki.org/wiki/Sysadmin_hub</Uri> + <ImageUri>http://upload.wikimedia.org/wikipedia/commons/thumb/d/d5/MediaWiki-sysadmins-icon.svg/175px-MediaWiki-sysadmins-icon.svg.png</ImageUri> + </AddLink> + <AddLink InDashboard="True"> + <Title>Community</Title> + <Description>Find: Forums, Documentation, FAQ's and Help</Description> + <Uri>http://www.mediawiki.org/wiki/Project:Help</Uri> + <ImageUri>http://upload.wikimedia.org/wikipedia/commons/thumb/3/3d/Mediawiki-logo.png/80px-Mediawiki-logo.png</ImageUri> + </AddLink> + <AddLink InDashboard="True"> + <Title>Developmer hub</Title> + <Description>This is an overview of MediaWiki development, including links to the key documents, resources and tools available to developers.</Description> + <Uri>http://www.mediawiki.org/wiki/Developer_hub</Uri> + <ImageUri>http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png</ImageUri> + </AddLink> + <AddLink InDashboard="True"> + <Title>Windows Azure Storage</Title> + <Description>This is a documentation about how to store files in the Windows Azure cloud, using the Windows Azure Storage Service.</Description> + <Uri>http://www.mediawiki.org/wiki/WPI/WindowsAzureStorage</Uri> + <ImageUri>http://upload.wikimedia.org/wikipedia/commons/0/0b/Crystal_Clear_app_tutorials.png</ImageUri> + </AddLink> + </Links> + <Ribbon> + <AddRibbonButton> + <Label>Site Admin</Label> + <Uri>/index.php?title=Special%3ASpecialPages</Uri> + <ImageUri>http://upload.wikimedia.org/wikipedia/commons/thumb/2/23/MediaWiki-extensions-icon.svg/52px-MediaWiki-extensions-icon.svg.png</ImageUri> + </AddRibbonButton> + </Ribbon> + + <PathProtection> + <AllowPath AllowNested="False"> + <RelativePath>web.config</RelativePath> + </AllowPath> + <ProtectPath> + <RelativePath>bin</RelativePath> + </ProtectPath> + <ProtectPath> + <RelativePath>docs</RelativePath> + </ProtectPath> + <ProtectPath> + <RelativePath>extensions</RelativePath> + </ProtectPath> + <ProtectPath> + <RelativePath>images</RelativePath> + </ProtectPath> + <ProtectPath> + <RelativePath>includes</RelativePath> + </ProtectPath> + <ProtectPath> + <RelativePath>languages</RelativePath> + </ProtectPath> + <ProtectPath> + <RelativePath>maintenance</RelativePath> + </ProtectPath> + <ProtectPath> + <RelativePath>mw-config</RelativePath> + </ProtectPath> + <ProtectPath> + <RelativePath>mw-wpi</RelativePath> + </ProtectPath> + <ProtectPath> + <RelativePath>resources</RelativePath> + </ProtectPath> + <ProtectPath> + <RelativePath>serialized</RelativePath> + </ProtectPath> + <ProtectPath> + <RelativePath>tests</RelativePath> + </ProtectPath> + <ProtectPath> + <RelativePath>*.php</RelativePath> + </ProtectPath> + + </PathProtection> + +</WebPlatform> \ No newline at end of file diff --git a/configuration-1.22.0/WpiSettings.php b/configuration-1.22.0/WpiSettings.php new file mode 100644 index 0000000..51b3f81 --- /dev/null +++ b/configuration-1.22.0/WpiSettings.php @@ -0,0 +1,25 @@ +<?php + +$wgWPIOptionStore = array( + //Screen1 + 'lang' => 'PlaceholderForLanguage', + //Screen2 + 'dbserver' => 'PlaceholderForDbServer', + 'dbname' => 'PlaceholderForDbName', + 'dbprefix' => 'PlaceholderForDbPrefix', + 'dbuser' => 'PlaceholderForDbUsername', + 'dbpass' => 'PlaceholderForDbPassword', + 'installdbuser' => 'PlaceholderForDbAdminUsername', + 'installdbpass' => 'PlaceholderForDbAdminPassword', + //Screen3 + 'sitename' => 'PlaceholderForSitename', + 'adminname' => 'PlaceholderForAdminname', + 'pass' => 'PlaceholderForAdminpass', + + 'scriptpath' => 'PlaceholderForScriptPath', + 'enablefileupload' => 'PlaceholderForFileUpload', + 'usewindowsazure' => 'PlaceholderForUseAzure', + 'azureaccount' => 'PlaceholderForAzureAccount', + 'azurekey' => 'PlaceholderForAzureKey', + 'wikiId' => 'PlaceholderForWikiId' + ); \ No newline at end of file diff --git a/configuration-1.22.0/install.sql b/configuration-1.22.0/install.sql new file mode 100644 index 0000000..a7ffb5f --- /dev/null +++ b/configuration-1.22.0/install.sql @@ -0,0 +1,15 @@ +USE PlaceholderForDbName; + +DROP PROCEDURE IF EXISTS add_user ; + +CREATE PROCEDURE add_user() +BEGIN +DECLARE EXIT HANDLER FOR 1044 BEGIN END; +GRANT ALL PRIVILEGES ON PlaceholderForDbName.* to 'PlaceholderForDbUsername'@'PlaceholderForDbServer' IDENTIFIED BY 'PlaceholderForDbPassword'; +FLUSH PRIVILEGES; +END +; + +CALL add_user() ; + +DROP PROCEDURE IF EXISTS add_user ; diff --git a/configuration-1.22.0/manifest.xml b/configuration-1.22.0/manifest.xml new file mode 100644 index 0000000..5d11449 --- /dev/null +++ b/configuration-1.22.0/manifest.xml @@ -0,0 +1,11 @@ +<MSDeploy.iisApp> + <iisApp path="mediawiki"/> + <dbmysql path="install.sql" /> + <setAcl path="mediawiki" + setAclUser="anonymousAuthenticationUser" + setAclAccess="Modify" /> + <setAcl path="mediawiki/images" + setAclUser="anonymousAuthenticationUser" + setAclAccess="Modify" /> + <alias from="WpiSettings.php" to="mediawiki/mw-config/WpiSettings.php" /> +</MSDeploy.iisApp> diff --git a/configuration-1.22.0/mw-config/index.php b/configuration-1.22.0/mw-config/index.php new file mode 100644 index 0000000..e2dc9b6 --- /dev/null +++ b/configuration-1.22.0/mw-config/index.php @@ -0,0 +1,152 @@ +<?php +/** + * New version of MediaWiki web-based config/installation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * + * @file + */ + +define( 'MW_CONFIG_CALLBACK', 'Installer::overrideConfig' ); +define( 'MEDIAWIKI_INSTALL', true ); + +chdir( dirname( __DIR__ ) ); +require dirname( __DIR__ ) . '/includes/WebStart.php'; + +require( dirname( __FILE__ ) . '/WpiSettings.php' ); + +wfInstallerMain(); + +function wfInstallerMain() { +// global $wgRequest, $wgLang, $wgMetaNamespace, $wgCanonicalNamespaceNames; + global $IP, $wgWPIOptionStore, $wgLanguageCode, $wgEnableUploads, $wgLogo; + + $siteName = $wgWPIOptionStore['sitename']; + $adminName = $wgWPIOptionStore['adminname']; + $wgLanguageCode = $wgWPIOptionStore['lang']; + $wgEnableUploads = (strtolower($wgWPIOptionStore['enablefileupload']) == 'yes'); + $wgLogo = "\$wgStylePath/common/images/wiki.png"; + + $wgWPIOptionStore['scriptpath'] = getScriptPath(); + + ob_start(); + echo "<pre>"; + + $installer = InstallerOverrides::getCliInstaller( $siteName, $adminName, $wgWPIOptionStore ); + + $status = $installer->doEnvironmentChecks(); + if( $status->isGood() ) { + $installer->showMessage( 'config-env-good' ); + $installer->execute(); + $installer->writeConfigurationFile( $IP ); + // Modify LocalSettings for WindowsAzure + if ( strtolower($wgWPIOptionStore['usewindowsazure']) == "yes" ) { + $azureSettings = " +require_once(\"\$IP/extensions/WindowsAzureSDK/WindowsAzureSDK.php\"); +require_once(\"\$IP/extensions/WindowsAzureStorage/WindowsAzureStorage.php\"); + +\$wgFileBackends[] = array( + 'name' => 'azure-backend', + 'class' => 'WindowsAzureFileBackend', + 'lockManager' => 'nullLockManager', + 'azureAccount' => '{$wgWPIOptionStore['azureaccount']}', + 'azureKey' => '{$wgWPIOptionStore['azurekey']}', + + //IMPORTANT: Mind the container naming conventions! http://msdn.microsoft.com/en-us/library/dd135715.aspx + 'wikiId' => '{$wgWPIOptionStore['wikiId']}', + 'containerPaths' => array( + 'media-public' => 'media-public', + 'media-thumb' => 'media-thumb', + 'media-deleted' => 'media-deleted', + 'media-temp' => 'media-temp', + + ) +); + +\$wgLocalFileRepo = array ( + 'class' => 'LocalRepo', + 'name' => 'local', + 'scriptDirUrl' => '/php/mediawiki-filebackend-azure', + 'scriptExtension' => '.php', + 'url' => \$wgScriptPath.'/img_auth.php', // It is important to set this to img_auth. Basically, there is no alternative. + 'hashLevels' => 2, + 'thumbScriptUrl' => false, + 'transformVia404' => false, + 'deletedHashLevels' => 3, + 'backend' => 'azure-backend', + 'zones' => + array ( + 'public' => + array ( + 'container' => 'local-public', + 'directory' => '', + ), + 'thumb' => + array( + 'container' => 'local-public', + 'directory' => 'thumb', + ), + 'deleted' => + array ( + 'container' => 'local-public', + 'directory' => 'deleted', + ), + 'temp' => + array( + 'container' => 'local-public', + 'directory' => 'temp', + ) + ) +); + +\$wgImgAuthPublicTest = false; +"; + file_put_contents( $IP.'/LocalSettings.php', $azureSettings, FILE_APPEND ); + } + } + echo "</pre>"; + + ob_end_clean(); + + // Installation done. Now change the cli installer to web installer + @rename($IP.'/mw-config/index.php', $IP.'/mw-config/index_cli.php'); + @rename($IP.'/mw-config/index_web.php', $IP.'/mw-config/index.php'); + + @unlink($IP.'/mw-config/WpiSettings.php'); + + header('Location: ../'); +} + +/** + * Get the script path + * + * @return String $wpiScriptPath The web platform installer script path + */ + +function getScriptPath() { + //setting the default value as empty + $wpiScriptPath = ''; + $path = false; + if ( !empty( $_SERVER['PHP_SELF'] ) ) { + $path = $_SERVER['PHP_SELF']; + } elseif ( !empty( $_SERVER['SCRIPT_NAME'] ) ) { + $path = $_SERVER['SCRIPT_NAME']; + } + if ($path !== false) { + $wpiScriptPath = preg_replace( '{^(.*)/(mw-)?config.*$}', '$1', $path ); + } + return $wpiScriptPath; +} diff --git a/configuration-1.22.0/parameters.xml b/configuration-1.22.0/parameters.xml new file mode 100644 index 0000000..c843f20 --- /dev/null +++ b/configuration-1.22.0/parameters.xml @@ -0,0 +1,465 @@ +<parameters> + <!-- MediaWiki parameters.xml file --> + <!-- Hallo Welt! Medienwerkstatt GmbH, http://www.hallowelt.biz --> + + <!-- One of the new features provides for localization of text + strings within the parameters.xml file. This localization can + be applied to "description" and "friendlyName" attributes of a + parameter. + + NOTE: There are a few parameters for mediawiki which are not + in the list of well known parameters. These parameters have + English descriptions and friendlyNames only. + --> + + <parameter + name="AppPath" + defaultValue="Default Web Site/mediawiki" + tags="iisapp" > + + <parameterEntry + type="ProviderPath" + scope="iisapp" + match="mediawiki" /> + <parameterEntry + type="ProviderPath" + scope="setacl" + match="mediawiki" /> + <parameterEntry + type="ProviderPath" + scope="alias" + match="mediawiki" /> + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForScriptPath" /> + + </parameter> + + <parameter name="Site URL" description="The base URL of the server, including protocol and without the trailing slash ( i.e., http://localhost:80 )" defaultValue="http://localhost"; tags="AppURL"> + <parameterValidation + type="RegularExpression" + validationString="^[^\\'$]*$" + /> + </parameter> + <parameter name="Automatic Site URL PostInstall" defaultValue='$wgServer = "{Site URL}";' tags="Hidden" > + <parameterEntry type="TextFile" scope="\\LocalSettings.php$" match='\$wgServer\s*=\s*"([^"]*)";' /> + </parameter> + + <parameter + name="DbServer" + defaultValue="localhost" + tags="MySQL,dbServer" > + + + <parameterEntry + type="TextFile" + scope="install.sql" + match="PlaceholderForDbServer" /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForDbServer" /> + + </parameter> + <parameter name="Automatic Dbserver" defaultValue ='$wgDBserver = "{DbServer}";' tags="MySQL,Hidden"> + <parameterEntry type="TextFile" scope="\\LocalSettings.php" match='\$wgDBserver\s*=\s*"([^"]*)";' /> + </parameter> + <!-- This parameter prompts the user for the database name. We have + set a validation RegEx on this parameter, as MySQL will not accept + a username that has more than 16 characters. + --> + + <parameter + name="DbName" + defaultValue="wikidb" + tags="MySQL,dbName" > + + <parameterValidation + type="RegularExpression" + validationString="^\w{1,16}$" /> + + <parameterEntry + type="TextFile" + scope="install.sql" + match="PlaceholderForDbName" /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForDbName" /> + + </parameter> + <parameter name="Automatic Dbname" defaultValue ='$wgDBname = "{DbName}";' tags="MySQL,Hidden" > + <parameterEntry type="TextFile" scope="\\LocalSettings.php" match='\$wgDBname\s*=\s*"([^"]*)";' /> + </parameter> + + <!-- This parameter prompts the user for the database table prefix. We have + set a validation RegEx on this parameter. + --> + + <parameter + name="Database table prefix" + defaultValue="mw_" + tags="MySQL,NoStore" + friendlyName="Database table prefix" + description="Please provide a table prefix if you are using several web platforms in one database. Use only ASCII letters (a-z, A-Z), numbers (0-9), underscores (_) and hyphens (-)." > + + <parameterValidation + type="RegularExpression" + validationString="^[a-zA-Z0-9_-]*$" + /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForDbPrefix" /> + + <description culture="en">Please provide a table prefix if you are using several web platforms in one database. Use only ASCII letters (a-z, A-Z), numbers (0-9), underscores (_) and hyphens (-).</description> + <description culture="de">Bitte geben Sie ein Tabellenpräfix an, wenn Sie mehrere Webplattformen in einer Datenbank nutzen wollen. Es dürfen nur ASCII-codierte Buchstaben (a-z, A-Z), Zahlen (0-9), Unter- (_) sowie Bindestriche (-) verwendet werden.</description> + <friendlyName culture="en">Database table prefix</friendlyName> + <friendlyName culture="de">Datenbanktabellenpräfix</friendlyName> + + </parameter> + <!-- + <parameter name="Automatic Dbprefix" defaultValue ='$wgDBprefix = "{DbPrefix}";' tags="MySQL,Hidden" > + <parameterEntry type="TextFile" scope="\\LocalSettings.php" match='\$wgDBprefix\s*=\s*"([^"]*)";' /> + </parameter> + --> + + <!-- This parameter prompts the user for the database username. We + have set a validation RegEx on this parameter, as MySQL will not + accept a username that has more than 16 characters. + --> + + <parameter + name="DbUsername" + defaultValue="wikiuser" + tags="MySQL,DbUsername" > + + <parameterValidation + type="RegularExpression" + validationString="^\w{1,16}$" /> + + <parameterEntry + type="TextFile" + scope="install.sql" + match="PlaceholderForDbUsername" /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForDbUsername" /> + + </parameter> + <parameter name="Automatic DbUsername" defaultValue ='$wgDBuser = "{DbUsername}";' tags="MySQL,Hidden" > + <parameterEntry type="TextFile" scope="\\LocalSettings.php" match='\$wgDBuser\s*=\s*"([^"]*)";' /> + </parameter> + <!-- This parameter prompts the user for the database user's password. + --> + + <parameter + name="DbPassword" + tags="New,Password,MySQL,DbUserPassword" > + + <parameterEntry + type="TextFile" + scope="install.sql" + match="PlaceholderForDbPassword" /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForDbPassword" /> + + </parameter> + + <parameter name="Automatic DbPassword" defaultValue ='$wgDBpassword = "{DbPassword}";' tags="MySQL,Hidden"> + <parameterEntry type="TextFile" scope="\\LocalSettings.php" match='\$wgDBpassword\s*=\s*"([^"]*)";' /> + </parameter> + + <!-- Prompts for the admin creds and uses it for the administrator + connection string. This is used to create a login and assign + permissions. The MySQL tag indicates it is a parameter required + for MySQL. The DbAdminUsername tag indicates it should be used + when the user is creating a new database. If they're not, it + can be filled in with the DbUsername value. The UI should be + able to figure out whether or not the user needs to be prompted + for this. + --> + + <parameter + name="DbAdminUsername" + defaultValue="root" + tags="MySQL,DbAdminUsername" > + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForDbAdminUsername" /> + + </parameter> + + <!-- Prompts for the admin password and uses it for the administrator + connection string. + --> + + <parameter + name="DbAdminPassword" + tags="Password,MySQL,DbAdminPassword" > + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForDbAdminPassword" /> + + </parameter> + + <parameter + name="Connection String" + defaultValue="Server={DbServer};Database={DbName};uid={DbAdminUsername};Pwd={DbAdminPassword};" + tags="Hidden,MySQLConnectionString,Validate,MySQL" > + + <parameterEntry + type="ProviderPath" + scope="dbmysql" + match="install.sql" /> + + </parameter> + + + <!-- MediaWiki specific parameters --> + + <!-- Set the correct path for the ACL based on the AppPath selected + by the user. + --> + + <parameter + name="SetAclParameter1" + defaultValue="{AppPath}/images" + tags="Hidden" > + + <parameterEntry + type="ProviderPath" + scope="setAcl" + match="mediawiki/images$" /> + + </parameter> + + <parameter + tags="MediaWiki,NoStore" + name="Name of wiki" + defaultValue="MyWiki" + friendlyName="Name of wiki" + description="Please provide a name for your MediaWiki site. It should not be MediaWiki." > + + <description culture="en">Please provide a name for your MediaWiki site. It should not be MediaWiki.</description> + <description culture="de">Bitte geben Sie einen Namen für Ihre MediaWiki-Site ein. Es sollte nicht sein MediaWiki.</description> + <friendlyName culture="en">Name of wiki</friendlyName> + <friendlyName culture="de">Name des Wikis</friendlyName> + + <!-- Sitename must not be "MediaWiki" --> + <parameterValidation + type="RegularExpression" + validationString="(?=^[^\\'$]*$)(?!^\s*[M|m]edia[W|w]iki\s*$)" /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForSitename" /> + + </parameter> + + <parameter + tags="MediaWiki,NoStore" + name="language" + defaultValue="en" + friendlyName="MediaWiki site language" + description="Please provide a default language for your MediaWiki site." > + + <description culture="en">Please provide a default language for your MediaWiki site.</description> + <description culture="de">Bitte geben Sie eine Standardsprache für Ihre MediaWiki-Site ein.</description> + <friendlyName culture="en">MediaWiki site language</friendlyName> + <friendlyName culture="de">MediaWiki Standardsprache</friendlyName> + + <parameterValidation + type="Enumeration" validationString="de,en" /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForLanguage" /> + + </parameter> + + <parameter + tags="MediaWiki,NoStore" + name="MediaWiki administrator name" + defaultValue="WikiSysop" + friendlyName="Name for MediaWiki administrator" + description="Please provide a name for your MediaWiki administrator account." > + + <description culture="en">Please provide a name for your MediaWiki administrator account.</description> + <description culture="de">Bitte geben Sie einen Namen für Ihren MediaWiki Administratoraccount ein.</description> + <friendlyName culture="en">MediaWiki administrator name</friendlyName> + <friendlyName culture="de">MediaWiki Administrator name</friendlyName> + + <parameterValidation + type="RegularExpression" + validationString="^[^\\'$@]{1,235}$" + /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForAdminname" /> + + </parameter> + + <parameter + tags="MediaWiki,NoStore,Password,New" + name="MediaWiki administrator password" + defaultValue="" + friendlyName="Password for MediaWiki administrator" + description="Please provide a password for your MediaWiki administrator account. Your password must be different from your username." > + + <description culture="en">Please provide a password for your MediaWiki administrator account. Your password must be different from your username.</description> + <description culture="de">Bitte geben Sie eine Passwort für Ihren MediaWiki Administratoraccount ein. Ihr Passwort muss mit dem Benutzernamen sein.</description> + <friendlyName culture="en">MediaWiki administrator password</friendlyName> + <friendlyName culture="de">MediaWiki Administrator Passwort</friendlyName> + + <parameterValidation + type="RegularExpression" + validationString="^[^\\'$]*$" + /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForAdminpass" /> + + </parameter> + + <!-- option to enable file upload on mediawiki --> + <parameter + name="Enable MediaWiki file upload" + defaultValue="No" + friendlyName="Enable MediaWiki file upload" + tags="MediaWiki,NoStore" + description="Select this if you want to enable MediaWiki file upload."> + + <description culture="en">Select this if you want to enable MediaWiki file upload.</description> + <description culture="de">Haken setzen, wenn Sie den Dateiupload in MediaWiki aktivieren wollen.</description> + <friendlyName culture="en">Enable MediaWiki file upload</friendlyName> + <friendlyName culture="de">MediaWiki Dateiupload aktivieren</friendlyName> + + <parameterValidation + type="Enumeration" + validationString="Yes,No" /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForFileUpload" /> + </parameter> + + <!-- Azure specific parameters --> + <parameter + tags="Azure,NoStore" + name="Use Windows Azure storage as file backend" + defaultValue="No" + friendlyName="Use Windows Azure as file backend" + description="Select this if you want to use Windows Azure as file backend" > + + <description culture="en">Select this if you want to use Windows Azure as file backend.</description> + <description culture="de">Haken setzen, wenn Sie Windows Azure als Speicherort für Dateien vewenden wollen.</description> + <friendlyName culture="en">Use Windows Azure storage as file backend</friendlyName> + <friendlyName culture="de">Verwenden Sie Windows Azure-Speicher als File-Backend</friendlyName> + + <!-- Renders as checkbox --> + <parameterValidation + type="Enumeration" + validationString="Yes,No" /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForUseAzure" /> + + </parameter> + + <!-- No space is allowed in Windows Azure storage account name, so default value without space --> + <parameter + tags="Azure,NoStore" + name="Windows Azure storage account name" + defaultValue="AzureStorageAccountName" + friendlyName="Windows Azure storage account name" + description="Please provide your Windows Azure storage account name. If you do not want to use Windows Azure as FileBackend for your MediaWiki you can leave this field unmodified." > + + <description culture="en">Please provide your Windows Azure storage account name. If you do not want to use Windows Azure as FileBackend for your MediaWiki you can leave this field unmodified.</description> + <description culture="de">Bitte geben Sie Ihre Windows Azure-Speicherkonto Name. Wenn Sie Windows Azure nicht als Dateispeicherort für Ihre MediaWiki-Installation nutzen wollen können Sie den Wert unverändert lassen.</description> + <friendlyName culture="en">Windows Azure storage account name</friendlyName> + <friendlyName culture="de">Windows Azure-Speicherkonto Name</friendlyName> + + <parameterValidation + type="RegularExpression" + validationString="^[a-z0-9]{3,24}$" + /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForAzureAccount" /> + + </parameter> + + <parameter + tags="Azure,NoStore" + name="Windows azure storage account key" + defaultValue="AzureStorageAccountKey" + friendlyName="Windows azure storage account key" + description="Please provide your Windows azure storage account key. If you do not want to use Windows Azure as FileBackend for your MediaWiki you can leave this field unmodified." > + + <description culture="en">Please provide your Windows azure storage account key. If you do not want to use Windows Azure as FileBackend for your MediaWiki you can leave this field unmodified.</description> + <description culture="de">Bitte geben Sie Ihre Windows Azure-Speicherkonto Schlüssel. Wenn Sie Windows Azure nicht als Dateispeicherort für Ihre MediaWiki-Installation nutzen wollen können Sie den Wert unverändert lassen.</description> + <friendlyName culture="en">Windows azure storage account key</friendlyName> + <friendlyName culture="de">Windows Azure-Speicherkonto Schlüssel</friendlyName> + + <parameterValidation + type="RegularExpression" + validationString="^[^\\'$]*$" + /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForAzureKey" /> + + </parameter> + + <parameter + tags="NoStore" + name="Wiki ID" + defaultValue="mywiki" + friendlyName="Wiki ID (Prefix to container names that is unique to this wiki)" + description="Prefix to container names that is unique to this wiki. Container names must start with a letter or number, and can contain only letters, numbers, and the dash (-) character. Every dash (-) character must be immediately preceded and followed by a letter or number, consecutive dashes are not permitted in container names. All letters in a container name must be lowercase. Container names must be from 3 through 63 characters long. This prefix must be from 3 through 30 characters long." > + + <description culture="en">Prefix to container names that is unique to this wiki. Container names must start with a letter or number, and can contain only letters, numbers, and the dash (-) character. Every dash (-) character must be immediately preceded and followed by a letter or number, consecutive dashes are not permitted in container names. All letters in a container name must be lowercase. Container names must be from 3 through 63 characters long. This prefix must be from 3 through 30 characters long.</description> + <description culture="de">Präfix für Container-Namen, die einzigartig in diesem Wiki ist. Container müssen mit einem Buchstaben oder einer Zahl beginnen und dürfen nur Buchstaben, Ziffern und den Bindestrich (-) enthalten Charakter. Jeder Strich (-) Zeichen unmittelbar vorausgehen muss und durch einen Buchstaben oder eine Zahl gefolgt, werden aufeinanderfolgende Striche nicht in Container-Namen erlaubt. Alle Buchstaben in einem Container-Name muss in Kleinbuchstaben geschrieben sein. Container-Namen müssen aus 3 bis 63 Zeichen lang sein. Dieses Präfix muss zwischen 3 und 30 Zeichen lang sein.</description> + <friendlyName culture="en">Wiki ID (Prefix to container names that is unique to this wiki)</friendlyName> + <friendlyName culture="de">Wiki-ID (Präfix Container-Namen, die eindeutig zu diesem Wiki ist)</friendlyName> + + <!-- limiting the container prefix length to 30 --> + <parameterValidation + type="RegularExpression" + validationString="(^([a-z]|\d))((-([a-z]|\d)|([a-z]|\d)){2,30})$" /> + + <parameterEntry + type="TextFile" + scope="WpiSettings.php" + match="PlaceholderForWikiId" /> + + </parameter> + +</parameters> diff --git a/mediawiki-1.22.0-IIS.zip b/mediawiki-1.22.0-IIS.zip new file mode 100644 index 0000000..c3fc8e7 --- /dev/null +++ b/mediawiki-1.22.0-IIS.zip Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/117172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia75ac6170bb85d17fe79495c02c183a908adeb5b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/packages/WPI Gerrit-Branch: master Gerrit-Owner: Mglaser <gla...@hallowelt.biz> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
