Browse Source

dev configuration

SiM 6 years ago
parent
commit
389ece0c33
6 changed files with 24 additions and 11 deletions
  1. 2 2
      config/app.yml
  2. 1 1
      config/databases.yml
  3. 3 5
      config/propel.ini
  4. 6 1
      web/admin.php
  5. 6 1
      web/api.php
  6. 6 1
      web/index.php

+ 2 - 2
config/app.yml

@@ -3,5 +3,5 @@ all:
     from: noreply@katao.fr
     smtp: localhost
   katao:
-    backend_url: http://admin.katao.fr/admin.php/
-    frontend_url: http://www.katao.fr/
+    backend_url: https://admin-katao-dev.tera.coop/admin.php/
+    frontend_url: https://katao-dev.tera.coop/

+ 1 - 1
config/databases.yml

@@ -2,4 +2,4 @@ all:
   propel:
     class:          sfPropelDatabase
     param:
-      dsn:          mysql://jean:@127.0.0.1/jean_katao
+      dsn:          mysql://katao:PASSWORD@127.0.0.1/katao

+ 3 - 5
config/propel.ini

@@ -3,8 +3,7 @@ propel.packageObjectModel  = true
 propel.project             = www.katao.fr
 propel.database            = mysql
 propel.database.createUrl  = mysql://root@localhost/
-propel.database.url        = mysql://jean:@localhost/jean_katao
-
+propel.database.url        = mysql://katao:PASSWORD@localhost/katao 
 propel.addGenericAccessors = true
 propel.addGenericMutators  = true
 propel.addTimeStamp        = false
@@ -13,7 +12,7 @@ propel.schema.validate     = false
 
 ; directories
 propel.home                    = .
-propel.output.dir              = /home/jroussel/public_html/CATALYZ/www.katao.fr
+propel.output.dir              = /var/www/katao
 propel.schema.dir              = ${propel.output.dir}/config
 propel.conf.dir                = ${propel.output.dir}/config
 propel.phpconf.dir             = ${propel.output.dir}/config
@@ -45,5 +44,4 @@ propel.builder.addBehaviors = true
 propel.mysql.tableType = InnoDB
 
 propel.defaultTimeStampFormat = Y-m-d H:i:s
-propel.defaultTimeFormat = H:i:s
-propel.defaultDateFormat = Y-m-d
+

+ 6 - 1
web/admin.php

@@ -2,5 +2,10 @@
 
 require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php');
 
-$configuration = ProjectConfiguration::getApplicationConfiguration('admin', 'prod', true);
+// DEV
+$configuration = ProjectConfiguration::getApplicationConfiguration('admin', 'dev', true);
+
+// PROD
+//$configuration = ProjectConfiguration::getApplicationConfiguration('admin', 'prod', true);
+
 sfContext::createInstance($configuration)->dispatch();

+ 6 - 1
web/api.php

@@ -2,5 +2,10 @@
 
 require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php');
 
-$configuration = ProjectConfiguration::getApplicationConfiguration('api', 'prod', false);
+// DEV
+$configuration = ProjectConfiguration::getApplicationConfiguration('api', 'dev', false);
+
+// PROD
+//$configuration = ProjectConfiguration::getApplicationConfiguration('api', 'prod', false);
+
 sfContext::createInstance($configuration)->dispatch();

+ 6 - 1
web/index.php

@@ -2,5 +2,10 @@
 
 require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php');
 
-$configuration = ProjectConfiguration::getApplicationConfiguration('frontend', 'prod', true);
+// DEV
+$configuration = ProjectConfiguration::getApplicationConfiguration('frontend', 'dev', true);
+
+// PROD
+//$configuration = ProjectConfiguration::getApplicationConfiguration('frontend', 'prod', true);
+
 sfContext::createInstance($configuration)->dispatch();