summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/.htaccess12
-rwxr-xr-xconfig/config.sample.php2
2 files changed, 13 insertions, 1 deletions
diff --git a/config/.htaccess b/config/.htaccess
new file mode 100644
index 00000000000..2421e9a1631
--- /dev/null
+++ b/config/.htaccess
@@ -0,0 +1,12 @@
+# line below if for Apache 2.4
+<ifModule mod_authz_core>
+Require all denied
+</ifModule>
+
+# line below if for Apache 2.2
+<ifModule !mod_authz_core>
+deny from all
+</ifModule>
+
+# section for Apache 2.2 and 2.4
+IndexIgnore *
diff --git a/config/config.sample.php b/config/config.sample.php
index 92b534d43de..3298672bf4a 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -54,7 +54,7 @@ $CONFIG = array(
"proxyuserpwd" => "",
/* List of trusted domains, to prevent host header poisoning ownCloud is only using these Host headers */
-'trusted_domains' => array('demo.owncloud.org'),
+'trusted_domains' => array('demo.owncloud.org', 'otherdomain.owncloud.org'),
/* Theme to use for ownCloud */
"theme" => "",