wip #7474 @1

diff --git a/.docker/config/httpd/httpd.conf b/.docker/config/httpd/httpd.conf
index 99b540dc461fd224124520b7fbeac90011621f1a..3f684980e2ce2983998969feae43b0eeac9df6ad 100644 (file)
--- a/.docker/config/httpd/httpd.conf
+++ b/.docker/config/httpd/httpd.conf
@@ -293,7 +293,7 @@ DocumentRoot "/application/"
     Require all granted
 </Directory>
 
-ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://fluidbook-v3:9000/application//$1" timeout=1800
+ProxyPassMatch ^/(.*\.php(/.*)?)$ "fcgi://php-fpm:9000/application//$1" timeout=1800
 
 XSendFile on
 XSendFilePath /application

diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index 849b70382aff05b418865ef5cab26a07afa0b035..cbf6223dff0b0173327141aab77b4036ea286197 100644 (file)
--- a/.docker/dev/docker-compose.yml
+++ b/.docker/dev/docker-compose.yml
@@ -5,8 +5,8 @@ services:
         build: './images/httpd'
         working_dir: /application
         volumes:
-            - './wwww/:/usr/local/apache2/htdocs/'
-            - './wwww/:/application/'
+            - './www/:/usr/local/apache2/htdocs/'
+            - './www/:/application/'
             - './config/httpd/httpd.conf:/usr/local/apache2/conf/httpd.conf'
         environment:
             VIRTUAL_HOST: dev.fluidbook.com,en.dev.fluidbook.com,dev.elearning.fluidbook.com
@@ -42,7 +42,7 @@ services:
             # PHP
             - './config/php.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini'
             # Web path
-            - './wwww/:/application/'
+            - './www/:/application/'
         tmpfs:
           - /home/tmp
           - /application/framework/data/temp

diff --git a/.docker/syncprodtodev b/.docker/syncprodtodev
new file mode 100644 (file)
index 0000000..30560ee
--- /dev/null
+++ b/.docker/syncprodtodev
@@ -0,0 +1,14 @@
+#!/bin/sh
+rsync -avz --delete --exclude-from /home/fluidbook-v3/dev/.docker/syncprodtodev.exclude --delete-excluded /home/fluidbook-v3/www/files/ /home/fluidbook-v3/dev/files/
+# Sync database
+docker stop fluidbook-v3-dev-mariadb
+rm -rf /docker/fluidbook-v3-dev/database/data/*
+rsync -avz /docker/fluidbook-v3/database/data/ /docker/fluidbook-v3-dev/database/data/
+docker stop fluidbook-v3-mariadb
+rsync -avz /docker/fluidbook-v3/database/data/ /docker/fluidbook-v3-dev/database/data/
+sleep 1
+rsync -avz /docker/fluidbook-v3/database/data/ /docker/fluidbook-v3-dev/database/data/
+rm /docker/fluidbook-v3/database/data/tc.log
+docker start fluidbook-v3-mariadb
+# Update and restart dev containers
+/docker/fluidbook-v3-dev/update

diff --git a/.docker/syncprodtodev.exclude b/.docker/syncprodtodev.exclude
new file mode 100644 (file)
index 0000000..f81cdd7
--- /dev/null
+++ b/.docker/syncprodtodev.exclude
@@ -0,0 +1,2 @@
+processed
+rasterized
\ No newline at end of file

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5b57a405eba310146032148d4639dc6c43663945..812d48492d2fad5d5c6b85f0051f735faa2e734f 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wip #7474 @0.25">
-      <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
+    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wip #7474">
+      <change afterPath="$PROJECT_DIR$/.docker/syncprodtodev" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.docker/syncprodtodev.exclude" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.docker/config/httpd/httpd.conf" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/config/httpd/httpd.conf" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.docker/dev/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/dev/docker-compose.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/framework/application/configs/application.ini" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/configs/application.ini" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -260,41 +264,41 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.date&quot;: &quot;false&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.permissions&quot;: &quot;false&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.size&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/Works/FluidbookWebV3/framework/library/CubeIT/Bootstrap&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
-    &quot;ruby.rails.projectView.checked&quot;: &quot;true&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;project.propVCSSupport.DirectoryMappings&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "WebServerToolWindowFactoryState": "true",
+    "WebServerToolWindowPanel.toolwindow.highlight.mappings": "true",
+    "WebServerToolWindowPanel.toolwindow.highlight.symlinks": "true",
+    "WebServerToolWindowPanel.toolwindow.show.date": "false",
+    "WebServerToolWindowPanel.toolwindow.show.permissions": "false",
+    "WebServerToolWindowPanel.toolwindow.show.size": "false",
+    "git-widget-placeholder": "master",
+    "ignore.virus.scanning.warn.message": "true",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "D:/Works/FluidbookWebV3/.docker",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "project.structure.last.edited": "Project",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.2",
+    "ruby.rails.projectView.checked": "true",
+    "settings.editor.selected.configurable": "project.propVCSSupport.DirectoryMappings",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\Works\FluidbookWebV3\.docker" />
       <recent name="D:\Works\FluidbookWebV3\framework\library\CubeIT\Bootstrap" />
       <recent name="D:\Works\FluidbookWebV3\framework\library\Zend\Xml" />
       <recent name="D:\Works\FluidbookWebV3\framework\library\Zend" />
       <recent name="H:\Works\FluidbookWebV3\framework\application\views\scripts\templates" />
-      <recent name="H:\Works\FluidbookWebV3\images\exemples\publications" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\Works\FluidbookWebV3\.docker" />
@@ -846,7 +850,7 @@
       <workItem from="1743588153623" duration="6412000" />
       <workItem from="1743685828952" duration="2161000" />
       <workItem from="1744010760355" duration="3501000" />
-      <workItem from="1744211486656" duration="1653000" />
+      <workItem from="1744211486656" duration="5649000" />
     </task>
     <task id="LOCAL-00117" summary="fix #1407 @1">
       <created>1494411210038</created>
@@ -1191,7 +1195,7 @@
       <option name="project" value="LOCAL" />
       <updated>1682409989659</updated>
     </task>
-    <option name="localTasksCounter" value="181" />
+    <option name="localTasksCounter" value="182" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">
         <option name="APIKey" value="ee454486fcd47aa38e5c99d5a7dc44cff1f65597" />
@@ -1223,7 +1227,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="wait #3693 @1.5" />
     <MESSAGE value="wait #3885 @0:50" />
     <MESSAGE value="wait #3912 @0:20" />
     <MESSAGE value="fix #3915 @0.25" />
@@ -1248,7 +1251,8 @@
     <MESSAGE value="#7257" />
     <MESSAGE value="try #7257 @2" />
     <MESSAGE value="wip #7474 @0.25" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #7474 @0.25" />
+    <MESSAGE value="wip #7474" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #7474" />
     <option name="NON_MODAL_COMMIT_POSTPONE_SLOW_CHECKS" value="false" />
   </component>
   <component name="XDebuggerManager">

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index b9827311da60fe31b91661998a0a7cafc16aa1b7..59e5215257e0410d73fc82622f8c511da7fbe3b8 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -69,11 +69,15 @@ locales.fr = fr.elearning.fluidbook.com
 database.params.dbname = fluidbook-v3-elearning
 
 [testing-learning : learning]
-
 dev=false
 
 seo.robots = false
 
+httpauth.username = fluidbook
+httpauth.password = fb2016
+httpauth.ip_whitelist[] = 176.134.43.17
+httpauth.ip_whitelist[] = 82.64.156.165
+
 webhost = dev.elearning.fluidbook.com
 
 locales.en = dev.elearning.fluidbook.com
@@ -90,7 +94,7 @@ seo.universalAnalytics = UA-4339912-9
 
 httpauth.username = fluidbook
 httpauth.password = fb2016
-httpauth.ip_whitelist[] = 130.180.213.67
+httpauth.ip_whitelist[] = 176.134.43.17
 httpauth.ip_whitelist[] = 82.64.156.165
 
 seo.robots = false

diff --git a/index.php b/index.php
index 15775198666086e62f83c438db1b2c8a5101871d..bac5c3f7a9b727aa3a9c5d27f57162d52b222020 100644 (file)
--- a/index.php
+++ b/index.php
@@ -3,8 +3,9 @@ putenv('TMPDIR=/home/tmp');
 $start = microtime(true);
 ini_set('log_errors', '1');
 ini_set('error_log', dirname(__FILE__) . '/log/php_error.log');
-
-if (strpos($_SERVER['HTTP_HOST'], 'elearning.') !== false) {
+if (strpos($_SERVER['HTTP_HOST'], 'dev.elearning.') !== false) {
+    define('APPLICATION_ENV', 'testing-learning');
+} elseif (strpos($_SERVER['HTTP_HOST'], 'elearning.') !== false) {
     define('APPLICATION_ENV', 'learning');
 } elseif (strpos($_SERVER['HTTP_HOST'], 'dev.') !== false) {
     define('APPLICATION_ENV', 'testing');