Added proper OKAPI settings to lib/settings-dist and lib/settings-dev files.

This commit is contained in:
Wojciech Rygielski 2012-08-18 15:41:39 +02:00
parent 56b80e025a
commit dfbbf2be1f
5 changed files with 38 additions and 20 deletions

39
.gitignore vendored
View File

@ -1,20 +1,21 @@
# common exclude files list # Commonly ignored files list. For locally ignored files (e.g. local IDE
# # settings), use .git/info/exclude file. Keep the lines in this file sorted.
# for local exclude files, see .git/info/exclude
htdocs/*/settings.inc.php
htdocs/*/*/settings.inc.php
htdocs/cache/*
htdocs/cache2/*
htdocs/download/*
htdocs/images/statpics/*
htdocs/images/uploads/*
htdocs/resource2/tinymce/tiny_mce_*.gz
htdocs/sitemap*xml*
htdocs/util-local/ocxml11client/data-files
htdocs/util-local/ocxml11client/tmp
lib/htmlpurifier-4.2.0/library/HTMLPurifier/DefinitionCache/Serializer/CSS/*
lib/htmlpurifier-4.2.0/library/HTMLPurifier/DefinitionCache/Serializer/HTML/*
lib/htmlpurifier-4.2.0/library/HTMLPurifier/DefinitionCache/Serializer/URI/*
/lib/htmlpurifier-4.2.0/library/HTMLPurifier/DefinitionCache/Serializer/CSS/*
/lib/htmlpurifier-4.2.0/library/HTMLPurifier/DefinitionCache/Serializer/HTML/*
/lib/htmlpurifier-4.2.0/library/HTMLPurifier/DefinitionCache/Serializer/URI/*
/htdocs/cache/*
/htdocs/cache2/*
/htdocs/config2/settings.inc.php
/htdocs/download/*
/htdocs/images/statpics/*
/htdocs/images/uploads/*
/htdocs/lib/settings.inc.php
/htdocs/resource2/tinymce/tiny_mce_*.gz
/htdocs/util-local/ocxml11client/data-files
/htdocs/util-local/ocxml11client/tmp
/htdocs/util/mysql_root/settings.inc.php
/htdocs/util/notification/settings.inc.php
/htdocs/util/publish_caches/settings.inc.php
/htdocs/util/watchlist/settings.inc.php
/htdocs/var/*

View File

@ -231,5 +231,11 @@
// (e.g. xml-interface and mapserver-results) // (e.g. xml-interface and mapserver-results)
// you can use -1 to use the master (not recommended, because replicated to slaves) // you can use -1 to use the master (not recommended, because replicated to slaves)
$opt['db']['slave']['primary'] = -1; $opt['db']['slave']['primary'] = -1;
$OKAPI_SETTINGS = array(
'OC_BRANCH' => 'oc.de',
'SITELANG' => 'de',
'VAR_DIR' => $opt['rootpath'].'var',
);
?> ?>

View File

@ -297,4 +297,11 @@ function post_config()
'filename' => 'http://geokrety.org/index.php?lang=de_DE.UTF-8' 'filename' => 'http://geokrety.org/index.php?lang=de_DE.UTF-8'
); );
} }
$OKAPI_SETTINGS = array(
'OC_BRANCH' => 'oc.de',
'SITELANG' => 'de',
'VAR_DIR' => $opt['rootpath'].'var',
);
?> ?>

4
htdocs/var/.htaccess Normal file
View File

@ -0,0 +1,4 @@
<FilesMatch ".*">
Order Deny,Allow
Deny from All
</FilesMatch>

0
htdocs/var/index.html Normal file
View File