tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-06-29 07:59:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	composer.json
This commit is contained in:
Ingo Schommer 2013-03-26 01:22:48 +01:00
commit cd56f026ce
6 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.htaccess
View File

@ -10,11 +10,20 @@
Deny from all Deny from all
</Files> </Files>
# This denies access to all yml files, since developers might include sensitive
# information in them. See the docs for work-arounds to serve some yaml files
<Files *.yml>
Order allow,deny
Deny from all
</Files>
ErrorDocument 404 /assets/error-404.html ErrorDocument 404 /assets/error-404.html
ErrorDocument 500 /assets/error-500.html ErrorDocument 500 /assets/error-500.html
<IfModule mod_alias.c> <IfModule mod_alias.c>
RedirectMatch 403 /silverstripe-cache(/|$) RedirectMatch 403 /silverstripe-cache(/|$)
RedirectMatch 403 /vendor(/|$)
RedirectMatch 403 /composer\.(json|lock)
</IfModule> </IfModule>
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
@ -23,6 +32,7 @@ ErrorDocument 500 /assets/error-500.html
RewriteCond %{REQUEST_URI} ^(.*)$ RewriteCond %{REQUEST_URI} ^(.*)$
RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_URI} !\.php$
RewriteRule .* framework/main.php?url=%1 [QSA] RewriteRule .* framework/main.php?url=%1 [QSA]
RewriteCond %{REQUEST_URI} ^(.*)/framework/main.php$ RewriteCond %{REQUEST_URI} ^(.*)/framework/main.php$

30
mysite/_config.php
View File

@ -1,18 +1,12 @@
<?php <?php
global $project; global $project;
$project = 'mysite'; $project = 'mysite';
global $database; global $database;
$database = ''; $database = '';
require_once('conf/ConfigureFromEnv.php'); require_once('conf/ConfigureFromEnv.php');
MySQLDatabase::set_connection_charset('utf8'); // Set the site locale
i18n::set_locale('en_US');
// Set the current theme. More themes can be downloaded from
// http://www.silverstripe.org/themes/
SSViewer::set_theme('simple');
// Enable nested URLs for this site (e.g. page/sub-page/)
if(class_exists('SiteTree')) SiteTree::enable_nested_urls();

9
mysite/_config/config.yml Normal file
View File

@ -0,0 +1,9 @@
---
Name: mysite
After: 'framework/*','cms/*'
---
# YAML configuration for SilverStripe
# See http://doc.silverstripe.org/framework/en/topics/configuration
# Caution: Indentation through two spaces, not tabs
SSViewer:
theme: 'simple'

8
mysite/code/Page.php
View File

@ -1,10 +1,10 @@
<?php <?php
class Page extends SiteTree { class Page extends SiteTree {
public static $db = array( private static $db = array(
); );
public static $has_one = array( private static $has_one = array(
); );
} }
@ -25,7 +25,7 @@ class Page_Controller extends ContentController {
* *
* @var array * @var array
*/ */
public static $allowed_actions = array ( private static $allowed_actions = array (
); );
public function init() { public function init() {
@ -40,4 +40,4 @@ class Page_Controller extends ContentController {
Requirements::themedCSS('form'); Requirements::themedCSS('form');
} }
} }

2
phpunit.xml.dist
View File

@ -25,7 +25,7 @@
<listeners> <listeners>
<listener class="SS_TestListener" file="framework/dev/TestListener.php" /> <listener class="SS_TestListener" file="framework/dev/TestListener.php" />
</listeners> </listeners>
<groups> <groups>
<exclude> <exclude>
<group>sanitychecks</group> <group>sanitychecks</group>

15
web.config
View File

@ -1,5 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<system.webServer> <system.webServer>
<security>
<requestFiltering>
<hiddenSegments>
<add segment="silverstripe-cache/" />
<add segment="vendor" />
<add segment="composer.json" />
<add segment="composer.lock" />
</hiddenSegments>
<fileExtensions allowUnlisted="true" >
<add fileExtension=".ss" allowed="false"/>
<add fileExtension=".yml" allowed="false"/>
</fileExtensions>
</requestFiltering>
</security>
</system.webServer> </system.webServer>
</configuration> </configuration>