refactor states for doil apply command

app/src/Commands/Instances/ApplyCommand.php

@@ -20,6 +20,21 @@ class ApplyCommand extends Command
 {
     protected const PATH_STATES = "/usr/local/share/doil/stack/states";
 
+    protected static array $non_user_states = [
+        "autoinstall",
+        "base",
+        "composer",
+        "composer2",
+        "composer54",
+        "dev",
+        "ilias",
+        "mailservices",
+        "proxyservices",
+        "reactor",
+        "change-roundcube-password",
+        "nodejs"
+    ];
+
     protected static $defaultName = "instances:apply";
     protected static $defaultDescription =
         "Apply state for the given instance. This is useful for re-applying singular state to your instance.";
@@ -62,12 +77,7 @@ public function execute(InputInterface $input, OutputInterface $output) : int
             throw new InvalidArgumentException("Not enough arguments (missing: \"instance\" or \"all\")");
         }
 
-        if (
-            $state == "mailservices" ||
-            $state == "proxyservices" ||
-            $state == "reactor" ||
-            $state == "change-roundcube-password"
-        ) {
+        if (in_array($state, self::$non_user_states)) {
             $this->writer->error(
                 $output,
                 "State '$state' is not allowed!",
@@ -96,17 +106,12 @@ public function execute(InputInterface $input, OutputInterface $output) : int
         if (is_null($state)) {
             $states = $this->filesystem->getFilesInPath(self::PATH_STATES);
 
-            $states = array_filter($states, function ($s) {
-               if (
-                   $s == "mailservices" ||
-                   $s == "proxyservices" ||
-                   $s == "reactor" ||
-                   $s == "change-roundcube-password"
-               ) {
+            $states = array_values(array_filter($states, function ($s) {
+               if (in_array($s, self::$non_user_states)) {
                    return false;
                }
                return true;
-            });
+            }));
 
             $helper = $this->getHelper("question");
             $question = new ChoiceQuestion(

app/src/Commands/Instances/CreateCommand.php

@@ -313,6 +313,11 @@ public function execute(InputInterface $input, OutputInterface $output) : int
         $this->docker->applyState($instance_salt_name, "base");
         $this->writer->endBlock();
 
+        // apply apache state
+        $this->writer->beginBlock($output, "Apply apache state");
+        $this->docker->applyState($instance_salt_name, "apache");
+        $this->writer->endBlock();
+
         // apply dev state
         $this->writer->beginBlock($output, "Apply dev state");
         $this->docker->applyState($instance_salt_name, "dev");
@@ -360,9 +365,14 @@ public function execute(InputInterface $input, OutputInterface $output) : int
         $this->docker->applyState($instance_salt_name, "access");
         $this->writer->endBlock();
 
-        // apply access state
-        $this->writer->beginBlock($output, "Apply ilias-postinstall state");
-        $this->docker->applyState($instance_salt_name, "ilias-postinstall");
+        // apply enable-whoops-devmode state
+        $this->writer->beginBlock($output, "Apply enable-whoops-devmode state");
+        $this->docker->applyState($instance_salt_name, "enable-whoops-devmode");
+        $this->writer->endBlock();
+
+        // apply compile-skins state
+        $this->writer->beginBlock($output, "Apply compile-skins state");
+        $this->docker->applyState($instance_salt_name, "compile-skins");
         $this->writer->endBlock();
 
         // finalizing docker image

setup/stack/config/master.cnf

@@ -658,6 +658,10 @@ file_roots:
     - /srv/salt/states/disable-xdebug
   enable-xdebug:
     - /srv/salt/states/enable-xdebug
+  disable-whoops-devmode:
+    - /srv/salt/states/disable-whoops-devmode
+  enable-whoops-devmode:
+    - /srv/salt/states/enable-whoops-devmode
   php7.2:
     - /srv/salt/states/php7.2
   php7.3:
@@ -672,16 +676,16 @@ file_roots:
     - /srv/salt/states/php8.2
   ilias:
     - /srv/salt/states/ilias
-  ilias-postinstall:
-    - /srv/salt/states/ilias-postinstall
+  compile-skins:
+    - /srv/salt/states/compile-skins
   composer:
     - /srv/salt/states/composer
   composer2:
     - /srv/salt/states/composer2
   composer54:
     - /srv/salt/states/composer54
-  composerupdate:
-    - /srv/salt/states/composerupdate
+  composer-install:
+    - /srv/salt/states/composer-install
   autoinstall:
     - /srv/salt/states/autoinstall
   access:
@@ -692,6 +696,8 @@ file_roots:
     - /srv/salt/states/proxyservices
   nodejs:
       - /srv/salt/states/nodejs
+  apache:
+      - /srv/salt/states/apache
 
 
 # The master_roots setting configures a master-only copy of the file_roots dictionary,

setup/stack/states/base/apache/init.sls → setup/stack/states/apache/apache/init.sls

@@ -32,10 +32,17 @@ apache_supervisor_signal:
   supervisord.running:
     - name: apache2
     - restart: True
+    - user: root
     - watch:
       - file: /etc/supervisor/conf.d/apache2.conf
       - file: /etc/apache2/sites-enabled/000-default.conf
 
+restart_apache:
+  cmd.run:
+    - name: supervisorctl restart apache2
+    - watch:
+      - apache_supervisor_signal
+
 apache_grain:
   grains.present:
     - value: True

setup/stack/states/apache/top.sls

@@ -0,0 +1,3 @@
+apache:
+  '*':
+    - apache

setup/stack/states/ilias-postinstall/compileskins/init.sls → setup/stack/states/compile-skins/compileskins/init.sls

@@ -3,4 +3,5 @@ compile_skins:
   cmd.run:
     - name: /var/www/html/CI/tools/compile-skins.sh
     - cwd: /var/www/html
+    - runas: root
 {%- endif %}

setup/stack/states/compile-skins/top.sls

@@ -0,0 +1,3 @@
+compile-skins:
+  '*':
+    - compileskins

setup/stack/states/composer-install/composer-install/init.sls

@@ -0,0 +1,5 @@
+ilias-composer-install:
+  cmd.run:
+    - name: composer install
+    - cwd: /var/www/html
+    - runas: root

setup/stack/states/composer-install/top.sls

@@ -0,0 +1,3 @@
+composer-install:
+  '*':
+    - composer-install

setup/stack/states/disable-whoops-devmode/top.sls

@@ -0,0 +1,3 @@
+disable-whoops-devmode:
+  '*':
+    - whoops-devmode

setup/stack/states/disable-whoops-devmode/whoops-devmode/init.sls

@@ -0,0 +1,11 @@
+remove_use_whoops:
+  file.line:
+    - name: /var/www/html/data/ilias/client.ini.php
+    - match: '^USE_WHOOPS'
+    - mode: delete
+
+remove_devmode:
+  file.line:
+    - name: /var/www/html/data/ilias/client.ini.php
+    - match: '^DEVMODE'
+    - mode: delete

setup/stack/states/enable-whoops-devmode/top.sls

@@ -0,0 +1,3 @@
+enable-whoops-devmode:
+  '*':
+    - whoops-devmode

setup/stack/states/enable-whoops-devmode/whoops-devmode/init.sls

@@ -0,0 +1,27 @@
+remove_use_whoops:
+  file.line:
+    - name: /var/www/html/data/ilias/client.ini.php
+    - match: '^USE_WHOOPS'
+    - mode: delete
+
+add_use_whoops:
+  file.line:
+      - name: /var/www/html/data/ilias/client.ini.php
+      - after: '^\[system\]'
+      - before: '^ROOT_FOLDER_ID'
+      - mode: insert
+      - content: 'USE_WHOOPS = "1"'
+
+remove_devmode:
+  file.line:
+    - name: /var/www/html/data/ilias/client.ini.php
+    - match: '^DEVMODE'
+    - mode: delete
+
+add_devmode:
+  file.line:
+      - name: /var/www/html/data/ilias/client.ini.php
+      - after: '^\[system\]'
+      - before: '^ROOT_FOLDER_ID'
+      - mode: insert
+      - content: 'DEVMODE = "1"'