Merge pull request #32 from OS2Forms/develop

Merging develop into master to add os2forms_forloeb_profile and Docksal environment update

Author: madsnorgaard

.docksal/commands/build-forloeb

@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+# Script reinstalling drupal from scratch based in os2forms_forloeb_profile.
+
+# Trapping CTRL-C
+trap ctrl_c INT
+trap ctrl_c SIGINT
+trap ctrl_c SIGTERM
+
+# Console colors
+red='\033[0;31m'
+green='\033[0;32m'
+green_bg='\033[42m'
+yellow='\033[1;33m'
+NC='\033[0m'
+
+# Helper functions for console output
+echo-red () { echo -e "${red}$1${NC}"; }
+echo-green () { echo -e "${green}$1${NC}"; }
+echo-green-bg () { echo -e "${green_bg}$1${NC}"; }
+echo-yellow () { echo -e "${yellow}$1${NC}"; }
+
+echo-yellow "Updating os2forms_forloeb module"
+fin composer update os2forms/os2forms_forloeb
+
+echo-yellow "Updating composer.lock file"
+fin composer update --lock
+
+echo-yellow "Fetching composer dependencies"
+fin composer install
+
+echo-yellow "Installing drupal based on os2forms_forloeb_profile"
+if ! fin drush status bootstrap | grep -q Successful ; then
+    echo "Drupal is not bootstrapped - starting site-install"
+    fin drush si os2forms_forloeb_profile --db-url=mysql://root:root@db/default --account-pass=admin --site-name=OS2forms_Forløb -y -v
+
+    # Creating demo-users - BEGIN
+
+    fin drush ucrt forloeb-designer --mail="os2forms-forloeb-designer@example.com" --password="forloeb-designer"
+    fin drush urol "forloeb_designer" forloeb-designer
+
+    fin drush ucrt flow-designer --mail="os2forms-flow-designer@example.com" --password="flow-designer"
+    fin drush urol "flow_designer" flow-designer
+
+    fin drush ucrt medarbejder --mail="os2forms-medarbejder@example.com" --password="medarbejder"
+    fin drush urol "medarbejder" medarbejder
+
+    fin drush ucrt sagsbehandler --mail="os2forms-sagsbehandler@example.com" --password="sagsbehandler"
+    fin drush urol "sagsbehandler" sagsbehandler
+
+    fin drush ucrt leder --mail="os2forms-leder@example.com" --password="leder"
+    fin drush urol "leder" leder
+
+    fin drush ucrt borger --mail="os2forms-borger@example.com" --password="borger"
+    fin drush urol "borger" borger
+
+    fin drush ucrt virksomhed --mail="os2forms-virksomhed@example.com" --password="virksomhed"
+    fin drush urol "virksomhed" virksomhed
+
+    # Creating demo-users - END
+
+    # Import of user interface translations. Never check for updates. Only use local translation source. Only overwrite imported translations.
+    # Comment out the three lines to run install without importing translations
+    fin drush locale-check
+    fin drush locale-update
+    # End import og translations
+
+else
+    echo "Drupal already bootstrapped - skipping install"
+fi
+
+echo-yellow "Install os2forms_forloeb, run update.php and clear caches"
+fin drush en os2forms_forloeb -y
+fin drush updb -y
+fin drush cr

.docksal/docksal.env

@@ -1,3 +1,3 @@
 DOCKSAL_STACK=default
 DOCROOT=web
-CLI_IMAGE="docksal/cli:2.6-php7.2"
+CLI_IMAGE="docksal/cli:2.11-php7.4"

.gitignore

@@ -40,6 +40,7 @@ simplesamlphp/*
 /.docksal/commands/*
 !/.docksal/commands/init
 !/.docksal/commands/rebuild-test
+!/.docksal/commands/build-forloeb
 
 # docker stuff
 .docker/php/logs/*.log
@@ -59,3 +60,4 @@ simplesamlphp/*
 /robots.txt
 /update.php
 /web.config
+/.gitattributes

README.md

@@ -59,17 +59,31 @@ These instructions will get you a copy of the project up and running on your loc
    fin start
    ```
 
-4. Install dependencies and enable modules
+4. Create local settings
    ```sh
-   fin rebuild-test
+   cp web/sites/example.settings.local.php web/sites/default/settings.local.php
+   ```
+
+5. Add file permission fix to settings.local.php. See https://docs.docksal.io/apps/drupal/#file-permissions
+   ```php
+   // web/sites/default/settings.local.php
+
+   $settings['file_chmod_directory'] = 0777;
+   $settings['file_chmod_file'] = 0666;
    ```
 
-5. Create local settings
+6. Here you can choose to install a standard OS2forms or include the OS2forms Forløb module with necessary configurations.
    ```sh
-   cp web/sites/example.settings.local.php web/sites/default/settings.local.php
+   # Option 1: Standard OS2forms test or development install
+   fin rebuild-test
+   ```
+   
+   ```sh
+   # Option 2: OS2forms 2.1 med Forløb test or development install
+   fin build-forloeb
    ```
 
-6. Configure trusted hosts in settings.local.php (add the following if not present)
+7. Configure trusted hosts in settings.local.php (add the following if not present)
    ```php
    // web/sites/default/settings.local.php
 
@@ -87,16 +101,18 @@ For a more detailed description, you could look at the `web/core/INSTALL.txt` [h
 
 * A HTTP server such as [Apache](https://httpd.apache.org/) that supports PHP
 * A database service such as [MySQL](https://www.mysql.com/)
-* PHP 7 with the following extensions enabled:
+* PHP 7.4 with the following extensions enabled:
   * gd
   * curl
   * simplexml
   * xml
   * dom
   * soap
   * mbstring
+  * zip
   * database specific extension such as the mysql extension
 * [Composer](https://getcomposer.org/)
+* [Drush launcher](https://github.com/drush-ops/drush-launcher)
 
 ### Installing
 
@@ -115,7 +131,26 @@ cd os2forms8
 composer install --no-dev
 ```
 
-4. Generate a salt string and insert it in web/sites/default/settings.php
+4. Create local settings
+   ```sh
+   cp web/sites/default.settings.local.php web/sites/default/settings.local.php
+   ```
+5. Add databases settings to web/sites/default/settings.local.php
+
+```
+   $databases['default']['default'] = array (
+     'database' => '[dbname]',
+     'username' => '[dbuser]',
+     'password' => '[dbpass]',
+     'prefix' => '',
+     'host' => '[dbhost]',
+     'port' => '',
+     'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
+     'driver' => 'mysql',
+   );
+```
+
+6. Generate a salt string and insert it in web/sites/default/settings.local.php
    ```sh
    # Generate salt string - this will output a new salt string
    ./vendor/bin/drush php-eval 'echo \Drupal\Component\Utility\Crypt::randomBytesBase64(55) . "\n";'
@@ -126,18 +161,29 @@ composer install --no-dev
    $settings['hash_salt'] = ''; // Insert the generated salt string here
    ```
 
-5. Configure trusted hosts in web/sites/default/settings.php.
+7. Configure trusted hosts in web/sites/default/settings.local.php.
    For more information on how to write this, see the section for [Trusted Host settings](https://www.drupal.org/docs/installing-drupal/trusted-host-settings)
    in the official Drupal installation guide.
    ```php
-   // web/sites/default/settings.php
+   // web/sites/default/settings.local.php
 
    $settings['trusted_host_patterns'] = [''];
    ```
-6. Visit the url for the os2forms application and follow the instructions
+8. Install Drupal
+
+   Using drush command:
+   ```
+   # To install default OS2Forms
+   drush si os2forms8 --account-pass=account_password --site-name="OS2Forms"
+   
+   # To install OS2Forms 2
+   drush si os2forms_forloeb_profile --account-pass=account_password --site-name="OS2Forms med forløb"
+   ```
+
+   Or visit the url for the os2forms application and follow the instructions
    * Select the os2forms install profile for a default os2forms installation
 
-7. Enable OS2Forms modules
+9. Enable OS2Forms modules
    ```sh
    ./vendor/bin/drush en os2forms, os2forms_nemid, os2forms_dawa, os2forms_sbsys
    ```

composer.json

@@ -20,6 +20,7 @@
         "composer/installers": "^1.2",
         "cweagans/composer-patches": "^1.6.5",
         "drupal/bootstrap": "^3.21",
+        "drupal/config_entity_revisions": "1.7.0",
         "drupal/console": "^1.0.2",
         "drupal/core": "^8.7.1",
         "drupal/core-composer-scaffold": "^8.9",
@@ -29,6 +30,7 @@
         "drupal/ldap": "^3.0@beta",
         "drupal/migrate_tools": "^5.0",
         "drupal/migrate_upgrade": "^3.2",
+        "drupal/permissions_by_term": "2.25",
         "drupal/queue_mail": "^1.3",
         "drupal/queue_ui": "^2.1",
         "drupal/restui": "^1.20",
@@ -37,14 +39,15 @@
         "drupal/telephone_validation": "^2.2",
         "drupal/webform_analysis": "^1.0@beta",
         "drupal/webform_composite": "^1.0@RC",
-        "drupal/webform_migrate": "1.x-dev",
+        "drupal/webform_migrate": "^1.2",
         "drupal/webform_node_element": "^1.1",
         "drupal/webform_scheduled_tasks": "^2.0",
         "drupal/webform_views": "^5.0@alpha",
         "drush/drush": "^9.0.0",
         "os2core/os2core": "^1.0.3",
         "os2forms/os2forms": "^2.5",
         "os2forms/os2forms_egbolig": "dev-master",
+        "os2forms/os2forms_forloeb": "1.1.0",
         "os2web/os2web_logging": "dev-master",
         "vlucas/phpdotenv": "^2.4",
         "webflo/drupal-finder": "^1.0.0",
@@ -108,17 +111,17 @@
             "force-reset": true
         },
         "patches": {
-            "drupal/webform" : {
-               "Add support for Set to state" :  "./patches/add-set-to-state-3159806-2-modified-5.19.patch"
+            "drupal/webform": {
+               "Add support for Set to state": "./patches/add-set-to-state-3159806-2-modified-5.19.patch"
             },
-            "drupal/webform_migrate" : {
-                "Set to support. Checkbox condition fixes" :  "./patches/setto-and-checkboxes-condition-fix-onlyD7.patch"
+            "drupal/webform_migrate": {
+                "Set to support. Checkbox condition fixes": "./patches/setto-and-checkboxes-condition-fix-onlyD7.patch"
             },
-            "drupal/queue_mail" : {
-                "Admin interface to see queued mail" :  "https://www.drupal.org/files/issues/2020-06-30/3096917-ui-queue-mail-moderate-5.patch"
+            "drupal/queue_mail": {
+                "Admin interface to see queued mail": "https://www.drupal.org/files/issues/2020-06-30/3096917-ui-queue-mail-moderate-5.patch"
             },
-            "drupal/smtp" : {
-                "Duplicated Attachments using webforms" :  "https://www.drupal.org/files/issues/2020-06-18/smtp-2995290-17.patch"
+            "drupal/smtp": {
+                "Duplicated Attachments using webforms": "https://www.drupal.org/files/issues/2020-06-18/smtp-2995290-17.patch"
             }
         }
     }