Skip to content

Commit

Permalink
from dev docu !
Browse files Browse the repository at this point in the history
  • Loading branch information
www-data authored and www-data committed Jan 25, 2012
1 parent 5f27463 commit af6eb8d
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions apache/httpd-vhosts-windows.conf
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@

php_value include_path ".;C:/Program Files/Apache Software Foundation/Apache2.2/htdocs/docu/classes;C:/Program Files/Apache Software Foundation/Apache2.2/htdocs/docu/classes/common_modules;C:/Program Files/Apache Software Foundation/Apache2.2/htdocs/docu/classes/cms;C:/Program Files/Apache Software Foundation/Apache2.2/htdocs/docu/includes;"

php_value include_path ".:/var/www/newgt/classes:/var/www/newgt/classes/common_modules:/var/www/newgt/classes/gt:/var/www/newgt/includes:"
#php_value auto_prepend_file "/var/www/newgt/classes/class.SessionHandler.php"
php_value include_path ".:/var/www/docu/classes:/var/www/docu/classes/common_modules:/var/www/docu/classes/gt:/var/www/docu/includes:"
#php_value auto_prepend_file "/var/www/docu/classes/class.SessionHandler.php"

php_flag magic_quotes_gpc off
php_flag magic_quotes_runtime off
Expand Down
30 changes: 15 additions & 15 deletions apache/httpd-vhosts.conf
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<VirtualHost *:80>
ServerAdmin mtel@erepublic.com
DocumentRoot /var/www/newgt/sites/cms/doc_root
Alias /common/ /var/www/newgt/core/doc_root/
Alias /public/ /var/www/newgt/public/
DocumentRoot /var/www/docu/sites/cms/doc_root
Alias /common/ /var/www/docu/core/doc_root/
Alias /public/ /var/www/docu/public/

ServerName dev.cms.erepublic.com

<Directory "/var/www/newgt/sites/cms/doc_root">
<Directory "/var/www/docu/sites/cms/doc_root">
Options FollowSymLinks MultiViews
ErrorDocument 404 /cms.php
AllowOverride None
Order allow,deny
Allow from all
</Directory>

php_value include_path ".:/var/www/newgt/core/models:/var/www/newgt/core/controllers:/var/www/newgt/sites/cms/models:/var/www/newgt/sites/cms/controllers:/var/www/newgt/includes:"
php_value include_path ".:/var/www/docu/core/models:/var/www/docu/core/controllers:/var/www/docu/sites/cms/models:/var/www/docu/sites/cms/controllers:/var/www/docu/includes:"

php_flag magic_quotes_gpc off
php_flag magic_quotes_runtime off
Expand All @@ -23,21 +23,21 @@

<VirtualHost *:80>
ServerAdmin mtel@erepublic.com
DocumentRoot /var/www/newgt/sites/gt/doc_root
Alias /common/ /var/www/newgt/core/doc_root/
Alias /public/ /var/www/newgt/public/
DocumentRoot /var/www/docu/sites/gt/doc_root
Alias /common/ /var/www/docu/core/doc_root/
Alias /public/ /var/www/docu/public/

ServerName dev.govtech2.com

<Directory "/var/www/newgt/sites/gt/doc_root">
<Directory "/var/www/docu/sites/gt/doc_root">
Options FollowSymLinks MultiViews
ErrorDocument 404 /index.php
AllowOverride None
Order allow,deny
Allow from all
</Directory>

php_value include_path ".:/var/www/newgt/core/models:/var/www/newgt/core/controllers:/var/www/newgt/core/contollers/modules:/var/www/newgt/sites/gt/models:/var/www/newgt/sites/gt/controllers:/var/www/newgt/includes:"
php_value include_path ".:/var/www/docu/core/models:/var/www/docu/core/controllers:/var/www/docu/core/contollers/modules:/var/www/docu/sites/gt/models:/var/www/docu/sites/gt/controllers:/var/www/docu/includes:"

php_flag magic_quotes_gpc off
php_flag magic_quotes_runtime off
Expand All @@ -46,21 +46,21 @@

<VirtualHost *:80>
ServerAdmin mtel@erepublic.com
DocumentRoot /var/www/newgt/sites/dc/doc_root
Alias /common/ /var/www/newgt/core/doc_root/
Alias /public/ /var/www/newgt/public/
DocumentRoot /var/www/docu/sites/dc/doc_root
Alias /common/ /var/www/docu/core/doc_root/
Alias /public/ /var/www/docu/public/

ServerName dev.dc2.com

<Directory "/var/www/newgt/sites/dc/doc_root">
<Directory "/var/www/docu/sites/dc/doc_root">
Options FollowSymLinks MultiViews
ErrorDocument 404 /index.php
AllowOverride None
Order allow,deny
Allow from all
</Directory>

php_value include_path ".:/var/www/newgt/core/models:/var/www/newgt/core/controllers:/var/www/newgt/core/controllers/modules:/var/www/newgt/sites/dc/models:/var/www/newgt/sites/dc/controllers:/var/www/newgt/includes:"
php_value include_path ".:/var/www/docu/core/models:/var/www/docu/core/controllers:/var/www/docu/core/controllers/modules:/var/www/docu/sites/dc/models:/var/www/docu/sites/dc/controllers:/var/www/docu/includes:"

php_flag magic_quotes_gpc off
php_flag magic_quotes_runtime off
Expand Down
4 changes: 2 additions & 2 deletions sites/cms/doc_root/integration_test.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
require_once('inc.basic.php');

require_once('inc.basic.php') ;
if(! User::Authorize('EDITOR'))
die('unauthorized');

Expand Down

0 comments on commit af6eb8d

Please sign in to comment.