瀏覽代碼

reset be users perms on update, fix filemounts update

Olivier Massot 2 年之前
父節點
當前提交
458c34f2ee
共有 2 個文件被更改,包括 7 次插入20 次删除
  1. 0 16
      doc/installation.md
  2. 7 4
      ot_admin/Classes/Controller/SiteController.php

+ 0 - 16
doc/installation.md

@@ -66,22 +66,6 @@ Pour tout mettre à jour:
     php composer.phar update
 
 
-### Synchroniser les données depuis prod-front sur preprod
-
-
-    ssh -A exploitation@preprod
-
-    # databases
-    cd ~/clonedb
-    python3.8 clonedb.py typo3
-    
-    # files
-    rsync -av --delete exploitation@prod-front:/var/www/typo3/config/sites/ /var/www/typo3/config/sites/
-    rsync -av --delete exploitation@prod-front:/var/www/typo3/public/fileadmin/ /var/www/typo3/public/fileadmin/
-    
-    rsync -av --delete exploitation@prod-front:/var/www/typo3/archive/ /var/www/typo3/archive/
-
-
 ### Mettre en mode maintenance
 
 Pour mettre une instance Typo3 en mode maintenance, accéder au serveur en ssh et éditer le .htaccess:

+ 7 - 4
ot_admin/Classes/Controller/SiteController.php

@@ -594,7 +594,7 @@ class SiteController extends ActionController
                 ->set('TSconfig', $tsconfig)
                 ->execute();
 
-            // Setup user and group rights
+            // Setup users and group rights
             $this->setBeUserPerms($organizationId, false, $beGroupUid, $beUserUid);
 
             // Try to commit the result
@@ -714,6 +714,9 @@ class SiteController extends ActionController
                 ->where($queryBuilder->expr()->eq('uid', $website['uid']))
                 ->execute();
 
+            // Reset the backend users and group permissions
+            $this->setBeUserPerms($organizationId, true);
+
             // Try to commit the result
             $commitSuccess = $this->connectionPool->getConnectionByName('Default')->commit();
             if (!$commitSuccess) {
@@ -2378,9 +2381,9 @@ class SiteController extends ActionController
             ->orWhere("path LIKE '%form_definitions/" . $organizationId . "/'");
         $statement = $queryBuilder->execute();
         $rows = $statement->fetchAllAssociative() ?: [];
-        $files = [];
+        $fileMounts = [];
         foreach ($rows as $row) {
-            $files[] = $row[0];
+            $fileMounts[] = $row['uid'];
         }
 
         $mainGroup = self::IS_PRODUCT_PREMIUM[$userData['product']] ? self::BEGROUP_EDITOR_PREMIUM : self::BEGROUP_EDITOR_STANDARD;
@@ -2391,7 +2394,7 @@ class SiteController extends ActionController
             'deleted' => 0,
             'subgroup' => $mainGroupUid,
             'db_mountpoints' => $rootUid,
-            'file_mountPoints' => implode(',', $files),
+            'file_mountPoints' => implode(',', $fileMounts),
             'file_permissions' => 'readFolder,writeFolder,addFolder,renameFolder,moveFolder,deleteFolder,readFile,writeFile,addFile,renameFile,replaceFile,moveFile,copyFile,deleteFile',
             'groupMods' => '',   // inherited from the base EditorsGroup
             'pagetypes_select' => '',   // inherited from the base EditorsGroup