Page MenuHomeIn-Portal Phabricator

D495.id1291.diff
No OneTemporary

File Metadata

Created
Fri, Feb 7, 4:33 PM

D495.id1291.diff

Index: branches/5.2.x/tools/build/build.properties.dist
===================================================================
--- branches/5.2.x/tools/build/build.properties.dist
+++ branches/5.2.x/tools/build/build.properties.dist
@@ -6,8 +6,13 @@
website.domain=
website.path=
+security.security_hmac_key=
+security.security_encryption_key=
+
db.host=localhost
+db.name=
db.user=
db.password=
-db.name=
+db.collation=
db.tableprefix=
+db.charset=
Index: branches/5.2.x/tools/build/targets/folders.xml
===================================================================
--- branches/5.2.x/tools/build/targets/folders.xml
+++ branches/5.2.x/tools/build/targets/folders.xml
@@ -37,31 +37,42 @@
<touch file="${base.dir}/system/config.php" />
<echo file="${base.dir}/system/config.php">&lt;?php
- $_CONFIG['Misc']['WriteablePath'] = '/system';
- $_CONFIG['Misc']['RestrictedPath'] = '/system/.restricted';
- $_CONFIG['Misc']['WebsitePath'] = '${website.path}';
- $_CONFIG['Misc']['Domain'] = '${website.domain}';
- $_CONFIG['Misc']['AdminDirectory'] = '/admin';
- $_CONFIG['Misc']['AdminPresetsDirectory'] = '/admin';
- $_CONFIG['Misc']['ApplicationClass'] = 'kApplication';
- $_CONFIG['Misc']['ApplicationPath'] = '/core/kernel/application.php';
- $_CONFIG['Misc']['CacheHandler'] = 'Fake';
- $_CONFIG['Misc']['MemcacheServers'] = 'localhost:11211';
- $_CONFIG['Misc']['CompressionEngine'] = 'php';
- $_CONFIG['Misc']['WebsiteCharset'] = 'utf-8';
- $_CONFIG['Misc']['EnableSystemLog'] = '1';
- $_CONFIG['Misc']['SystemLogMaxLevel'] = '5';
- $_CONFIG['Misc']['TrustProxy'] = '0';
-
- $_CONFIG['Database']['DBType'] = 'mysql';
- $_CONFIG['Database']['DBHost'] = '${db.host}';
- $_CONFIG['Database']['DBName'] = '${db.name}';
- $_CONFIG['Database']['DBUser'] = '${db.user}';
- $_CONFIG['Database']['DBUserPassword'] = '${db.password}';
- $_CONFIG['Database']['DBCollation'] = 'utf8_general_ci';
- $_CONFIG['Database']['TablePrefix'] = '${db.tableprefix}';
- $_CONFIG['Database']['DBCharset'] = 'utf8';
- </echo>
+// Generated by Phing.
+$_CONFIG['Misc']['AdminDirectory'] = '/admin';
+$_CONFIG['Misc']['AdminPresetsDirectory'] = '/admin';
+$_CONFIG['Misc']['ApplicationClass'] = 'kApplication';
+$_CONFIG['Misc']['ApplicationPath'] = '/core/kernel/application.php';
+$_CONFIG['Misc']['CacheHandler'] = 'Fake';
+$_CONFIG['Misc']['MaxCacheDuration'] = '30';
+$_CONFIG['Misc']['CmsMenuRebuildTime'] = '10';
+$_CONFIG['Misc']['DomainsParsedRebuildTime'] = '2';
+$_CONFIG['Misc']['EditorPath'] = '/core/ckeditor/';
+$_CONFIG['Misc']['EnableSystemLog'] = '0';
+$_CONFIG['Misc']['MemcacheServers'] = 'localhost:11211';
+$_CONFIG['Misc']['CompressionEngine'] = 'php';
+$_CONFIG['Misc']['RestrictedPath'] = '/system/.restricted';
+$_CONFIG['Misc']['SectionsParsedRebuildTime'] = '5';
+$_CONFIG['Misc']['StructureTreeRebuildTime'] = '10';
+$_CONFIG['Misc']['SystemLogMaxLevel'] = '5';
+$_CONFIG['Misc']['TemplateMappingRebuildTime'] = '5';
+$_CONFIG['Misc']['TrustProxy'] = '0';
+$_CONFIG['Misc']['UnitCacheRebuildTime'] = '10';
+$_CONFIG['Misc']['WebsiteCharset'] = 'utf-8';
+$_CONFIG['Misc']['WebsitePath'] = '${website.path}';
+$_CONFIG['Misc']['WriteablePath'] = '/system';
+$_CONFIG['Misc']['SecurityHmacKey'] = '${security.security_hmac_key}';
+$_CONFIG['Misc']['SecurityEncryptionKey'] = '${security.security_encryption_key}';
+$_CONFIG['Misc']['Domain'] = '${website.domain}';
+
+$_CONFIG['Database']['DBType'] = 'mysqli';
+$_CONFIG['Database']['DBHost'] = '${db.host}';
+$_CONFIG['Database']['DBName'] = '${db.name}';
+$_CONFIG['Database']['DBUser'] = '${db.user}';
+$_CONFIG['Database']['DBUserPassword'] = '${db.password}';
+$_CONFIG['Database']['DBCollation'] = '${db.collation}';
+$_CONFIG['Database']['TablePrefix'] = '${db.tableprefix}';
+$_CONFIG['Database']['DBCharset'] = '${db.charset}';
+</echo>
</target>
<target name="config-delete" description="Deletes '/system/config.php' file" depends="create-aliases">

Event Timeline