Browse Source

Updating prod/dev settings

Julio Montoya 9 years ago
parent
commit
9160c4e0bf
6 changed files with 112 additions and 11 deletions
  1. 0 10
      app/config/config.yml
  2. 10 0
      app/config/config_dev.yml
  3. 27 0
      app/config/config_prod.yml
  4. 2 0
      app/config/parameters.yml.dist
  5. 5 1
      composer.json
  6. 68 0
      web/.htaccess

+ 0 - 10
app/config/config.yml

@@ -204,16 +204,6 @@ liip_theme:
     active_theme: 'web'
     assetic_integration: true
 
-jjanvier_crowdin:
-    crowdin:
-        api_key: 7207f8a2e4bf8cac21c1b6a74ad88af4
-        project_identifier: chamilo-lms
-    github:
-        username: "something_useless"
-        project: "something_useless"
-    project:
-        path: "something_useless"
-
 ivory_ck_editor:
     autoload: false
     base_path: "bundles/ivoryckeditor"

+ 10 - 0
app/config/config_dev.yml

@@ -1,6 +1,16 @@
 imports:
     - { resource: config.yml }
 
+jjanvier_crowdin:
+    crowdin:
+        api_key: "%jjanvier_crowdin.api_key%"
+        project_identifier: chamilo-lms
+    github:
+        username: "something_useless"
+        project: "something_useless"
+    project:
+        path: "something_useless"
+
 framework:
     router:
         resource: "%kernel.root_dir%/config/routing_dev.yml"

+ 27 - 0
app/config/config_prod.yml

@@ -0,0 +1,27 @@
+imports:
+    - { resource: config.yml }
+
+#framework:
+#    validation:
+#        cache: validator.mapping.cache.apc
+#    serializer:
+#        cache: serializer.mapping.cache.apc
+
+#doctrine:
+#    orm:
+#        metadata_cache_driver: apc
+#        result_cache_driver: apc
+#        query_cache_driver: apc
+
+monolog:
+    handlers:
+        main:
+            type:         fingers_crossed
+            action_level: error
+            handler:      nested
+        nested:
+            type:  stream
+            path:  "%kernel.logs_dir%/%kernel.environment%.log"
+            level: debug
+        console:
+            type:  console

+ 2 - 0
app/config/parameters.yml.dist

@@ -25,4 +25,6 @@ parameters:
     sylius.cache:
         type: file_system
 
+    jjanvier_crowdin.api_key: ~
+
 

+ 5 - 1
composer.json

@@ -89,6 +89,8 @@
 
         "knplabs/gaufrette": "~0.1.6",
         "knplabs/knp-menu-bundle": "~2.0",
+        "michelf/php-markdown": "~1.4",
+        "knplabs/knp-markdown-bundle": "~1.3",
 
         "sp/bower-bundle": "dev-master",
         "jmontoyaa/migration-bundle":"dev-master",
@@ -98,12 +100,13 @@
         "sonata-project/block-bundle": "dev-master",
         "sonata-project/intl-bundle": "dev-master",
         "sonata-project/datagrid-bundle": "dev-master",
+        "sonata-project/formatter-bundle": "dev-master",
 
         "mopa/bootstrap-bundle": "v3.0.0-beta3",
         "twbs/bootstrap": "v3.0.0",
 
         "liip/theme-bundle": "dev-master",
-        "egeloen/ckeditor-bundle": "~3.0",
+        "egeloen/ckeditor-bundle": "~2.2",
         "friendsofsymfony/jsrouting-bundle": "~1.5",
         "friendsofsymfony/comment-bundle": "~2.0@dev",
 
@@ -132,6 +135,7 @@
         "bower-asset/aCollapTable": "1.0.*",
         "bower-asset/cropper": "1.0.*",
         "bower-asset/jquery.scrollbar": "0.2.*",
+
         "clue/graph": "~0.9.0",
         "graphp/graphviz": "~0.2.0",
         "graphp/algorithms": "~0.8.0",

+ 68 - 0
web/.htaccess

@@ -0,0 +1,68 @@
+# Use the front controller as index file. It serves as a fallback solution when
+# every other rewrite/redirect fails (e.g. in an aliased environment without
+# mod_rewrite). Additionally, this reduces the matching process for the
+# start page (path "/") because otherwise Apache will apply the rewriting rules
+# to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
+DirectoryIndex app.php
+
+# By default, Apache does not evaluate symbolic links if you did not enable this
+# feature in your server configuration. Uncomment the following line if you
+# install assets as symlinks or if you experience problems related to symlinks
+# when compiling LESS/Sass/CoffeScript assets.
+# Options FollowSymlinks
+
+# Disabling MultiViews prevents unwanted negotiation, e.g. "/app" should not resolve
+# to the front controller "/app.php" but be rewritten to "/app.php/app".
+<IfModule mod_negotiation.c>
+    Options -MultiViews
+</IfModule>
+
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+
+    # Determine the RewriteBase automatically and set it as environment variable.
+    # If you are using Apache aliases to do mass virtual hosting or installed the
+    # project in a subdirectory, the base path will be prepended to allow proper
+    # resolution of the app.php file and to redirect to the correct URI. It will
+    # work in environments without path prefix as well, providing a safe, one-size
+    # fits all solution. But as you do not need it in this case, you can comment
+    # the following 2 lines to eliminate the overhead.
+    RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$
+    RewriteRule ^(.*) - [E=BASE:%1]
+
+    # Sets the HTTP_AUTHORIZATION header removed by apache
+    RewriteCond %{HTTP:Authorization} .
+    RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+
+    # Redirect to URI without front controller to prevent duplicate content
+    # (with and without `/app.php`). Only do this redirect on the initial
+    # rewrite by Apache and not on subsequent cycles. Otherwise we would get an
+    # endless redirect loop (request -> rewrite to front controller ->
+    # redirect -> request -> ...).
+    # So in case you get a "too many redirects" error or you always get redirected
+    # to the start page because your Apache does not expose the REDIRECT_STATUS
+    # environment variable, you have 2 choices:
+    # - disable this feature by commenting the following 2 lines or
+    # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the
+    #   following RewriteCond (best solution)
+    RewriteCond %{ENV:REDIRECT_STATUS} ^$
+    RewriteRule ^app\.php(/(.*)|$) %{ENV:BASE}/$2 [R=301,L]
+
+    # If the requested filename exists, simply serve it.
+    # We only want to let Apache serve files and not directories.
+    RewriteCond %{REQUEST_FILENAME} -f
+    RewriteRule .? - [L]
+
+    # Rewrite all other queries to the front controller.
+    RewriteRule .? %{ENV:BASE}/app.php [L]
+</IfModule>
+
+<IfModule !mod_rewrite.c>
+    <IfModule mod_alias.c>
+        # When mod_rewrite is not available, we instruct a temporary redirect of
+        # the start page to the front controller explicitly so that the website
+        # and the generated links can still be used.
+        RedirectMatch 302 ^/$ /app.php/
+        # RedirectTemp cannot be used instead
+    </IfModule>
+</IfModule>