add a root url for corpus back apis. it is set to the same than root api for the moment
authorymh <ymh.work@gmail.com>
Mon, 03 Oct 2016 16:32:41 +0200
changeset 318 5564f5065f81
parent 317 e653de66f252
child 319 78990a8a069b
add a root url for corpus back apis. it is set to the same than root api for the moment
cms/app-client/app/adapters/application.js
cms/app-client/app/components/discourses-component.js
cms/app-client/app/components/visu-langues.js
cms/app-client/config/environment.js
cms/app-client/mirage/config.js
dev/provisioning/modules/sysconfig/manifests/apache.pp
dev/provisioning/modules/sysconfig/manifests/corpus.pp
dev/provisioning/modules/sysconfig/templates/corpus/corpus_env.conf.erb
dev/provisioning/modules/sysconfig/templates/corpus/local.env.erb
dev/provisioning/modules/sysconfig/templates/httpd/vhost.conf.erb
--- a/cms/app-client/app/adapters/application.js	Sun Oct 02 21:43:05 2016 +0200
+++ b/cms/app-client/app/adapters/application.js	Mon Oct 03 16:32:41 2016 +0200
@@ -9,7 +9,7 @@
 
 export default RESTAdapter.extend({
 
-    namespace: ENV.rootURL.replace(/\/$/,"")+'/api/v1',
+    namespace: ENV.backRootURL.replace(/\/$/,"")+'/api/v1',
 
     buildURL: function(modelName, id) {
         if(modelName === 'transcript') {
--- a/cms/app-client/app/components/discourses-component.js	Sun Oct 02 21:43:05 2016 +0200
+++ b/cms/app-client/app/components/discourses-component.js	Mon Oct 03 16:32:41 2016 +0200
@@ -18,7 +18,7 @@
 
     didRender: function() {
         var self = this;
-        var baseURL = ENV.rootURL.replace(/\/$/,"")+'/api/v1/stats';
+        var baseURL = ENV.backRootURL.replace(/\/$/,"")+'/api/v1/stats';
 
         d3.json(baseURL + "/discourses", function(discourses) {
             var array = Object.keys(discourses).map(function (key) { return discourses[key].count; });
--- a/cms/app-client/app/components/visu-langues.js	Sun Oct 02 21:43:05 2016 +0200
+++ b/cms/app-client/app/components/visu-langues.js	Mon Oct 03 16:32:41 2016 +0200
@@ -15,7 +15,7 @@
 
     didInsertElement: function(){
         var self = this;
-        var baseurl = ENV.rootURL.replace(/\/$/,"")+'/api/v1';
+        var baseurl = ENV.backRootURL.replace(/\/$/,"")+'/api/v1';
 
         d3.json(baseurl+"/stats/languages", function(languages) {
             var margin = { top: 30, right: 0, bottom: 0, left: 0 };
--- a/cms/app-client/config/environment.js	Sun Oct 02 21:43:05 2016 +0200
+++ b/cms/app-client/config/environment.js	Mon Oct 03 16:32:41 2016 +0200
@@ -6,6 +6,7 @@
         modulePrefix: 'app-client',
         environment: environment,
         rootURL: '/corpus/',
+        backRootURL: '/corpus/',
         locationType: 'hash',
         EmberENV: {
             FEATURES: {
@@ -33,6 +34,7 @@
     }
     if (environment === 'test') {
         ENV.rootURL = '/';
+        ENV.backRootURL = '/';
         ENV.locationType = 'none';
         ENV.APP.LOG_ACTIVE_GENERATION = false;
         ENV.APP.LOG_VIEW_LOOKUPS = false;
@@ -42,4 +44,4 @@
         ENV.APP.baseStatic = '/modules/corpus/app-client/';
     }
     return ENV;
-};
\ No newline at end of file
+};
--- a/cms/app-client/mirage/config.js	Sun Oct 02 21:43:05 2016 +0200
+++ b/cms/app-client/mirage/config.js	Mon Oct 03 16:32:41 2016 +0200
@@ -13,7 +13,7 @@
     */
     // this.urlPrefix = '';    // make this `http://localhost:8080`, for example, if your API is on a different server
     // this.namespace = '';    // make this `api`, for example, if your API is namespaced
-    this.namespace = ENV.rootURL.replace(/\/$/,'')+'/api/v1';
+    this.namespace = ENV.backRootURL.replace(/\/$/,'')+'/api/v1';
     // this.timing = 400;      // delay for each request, automatically set to 0 during testing
 
     this.get('/documents', function({ documents }) {
--- a/dev/provisioning/modules/sysconfig/manifests/apache.pp	Sun Oct 02 21:43:05 2016 +0200
+++ b/dev/provisioning/modules/sysconfig/manifests/apache.pp	Mon Oct 03 16:32:41 2016 +0200
@@ -65,7 +65,7 @@
     ]
     $corpus_folders = [
         "/var/www/corpusdelaparole",
-        "/var/www/corpusdelaparole/corpus",
+        "/var/www/corpusdelaparole/corpus-back",
         "/var/www/corpusdelaparole/drupal"
     ]
 
--- a/dev/provisioning/modules/sysconfig/manifests/corpus.pp	Sun Oct 02 21:43:05 2016 +0200
+++ b/dev/provisioning/modules/sysconfig/manifests/corpus.pp	Mon Oct 03 16:32:41 2016 +0200
@@ -16,12 +16,12 @@
         notify => Service['httpd']
     }
 
-    file { "/var/www/corpusdelaparole/corpus/.env":
+    file { "/var/www/corpusdelaparole/corpus-back/.env":
         ensure => file,
         owner => 'apache',
         group => 'apache',
         content => template("sysconfig/corpus/local.env.erb"),
-        require=>File["/var/www/corpusdelaparole/corpus"]
+        require=>File["/var/www/corpusdelaparole/corpus-back"]
     }
 
 }
--- a/dev/provisioning/modules/sysconfig/templates/corpus/corpus_env.conf.erb	Sun Oct 02 21:43:05 2016 +0200
+++ b/dev/provisioning/modules/sysconfig/templates/corpus/corpus_env.conf.erb	Mon Oct 03 16:32:41 2016 +0200
@@ -1,7 +1,7 @@
 SetEnv APP_ENV local
 SetEnv APP_DEBUG false
 SetEnv APP_KEY <%= @corpus_app_key %>
-SetEnv APP_URL http://<%= @vhost %>/corpus/
+SetEnv APP_URL http://<%= @vhost %>/corpus-back/
 
 SetEnv DATABASE_DRIVER mysql
 SetEnv DB_HOST localhost
--- a/dev/provisioning/modules/sysconfig/templates/corpus/local.env.erb	Sun Oct 02 21:43:05 2016 +0200
+++ b/dev/provisioning/modules/sysconfig/templates/corpus/local.env.erb	Mon Oct 03 16:32:41 2016 +0200
@@ -1,7 +1,7 @@
 APP_ENV=local
 APP_DEBUG=true
 APP_KEY=<%= @corpus_app_key %>
-APP_URL=http://<%= @vhost %>/corpus/
+APP_URL=http://<%= @vhost %>/corpus-back/
 
 DATABASE_DRIVER=mysql
 DB_HOST=localhost
--- a/dev/provisioning/modules/sysconfig/templates/httpd/vhost.conf.erb	Sun Oct 02 21:43:05 2016 +0200
+++ b/dev/provisioning/modules/sysconfig/templates/httpd/vhost.conf.erb	Mon Oct 03 16:32:41 2016 +0200
@@ -10,7 +10,7 @@
   DocumentRoot "/var/www/corpusdelaparole/drupal"
 
   ## Alias declarations for resources outside the DocumentRoot
-  Alias /corpus "/var/www/corpusdelaparole/corpus/public"
+  Alias /corpus-back "/var/www/corpusdelaparole/corpus-back/public"
 
   <Directory "/var/www/corpusdelaparole/drupal">
     AllowOverride all
@@ -18,7 +18,7 @@
   </Directory>
 
 
-  <Directory "/var/www/corpusdelaparole/corpus/public">
+  <Directory "/var/www/corpusdelaparole/corpus-back/public">
     AllowOverride None
     Require all granted
     IncludeOptional /etc/www/corpus_env.con[f]
@@ -28,10 +28,10 @@
       </IfModule>
 
       RewriteEngine On
-      RewriteBase /corpus/
+      RewriteBase /corpus-back/
 
       # Redirect Trailing Slashes...
-      RewriteRule ^(.*)/$ /corpus/$1 [L,R=301]
+      RewriteRule ^(.*)/$ /corpus-back/$1 [L,R=301]
 
       # Handle Front Controller...
       RewriteCond %{REQUEST_FILENAME} !-d