Engineblock: Clean non docker related configuration

roles/engineblock/defaults/main.yml

@@ -1,7 +1,6 @@
 ## Version of EngineBlock that is installable by this role
-engine_version: ''
+engine_version: ""
 # Be aware that if you enable this option that NPM, Node.js and Composer are installed
-#engine_branch: "develop"
 # Feature toggles
 engine_feature_encrypted_assertions: 1
 engine_feature_encrypted_assertions_require_outer_signature: 1
@@ -42,7 +41,7 @@ engine_domain: engine.{{ base_domain }}
 engine_debug: false
 
 engine_theme: "skeune"
-#engine_theme: openconext
+# engine_theme: openconext
 
 engine_profile_baseurl: "https://profile.{{ base_domain }}"
 
@@ -90,17 +89,6 @@ engine_stepup_gateway_sfo_public_key_file: "{{ engine_keys.default.publicFile }}
 ## The minimum priority of messages that will be logged
 engine_logging_passthru_level: NOTICE
 
-#engine_initial_sql: ''
-
-engineblock_symfony_cache_path: "/tmp/engineblock/cache"
-engineblock_symfony_log_path: "{{ engine_current_release_symlink }}/var/logs"
-
-engine_fpm_user: engine
-engine_fpm_port: 801
-engine_fpm_memory: 128M
-# When using vagrant for provisioning, it's not possible to put something in the inventory dir
-engine_crt_not_in_inventory: false
-
 # The memory limit used for the metadata push
 engine_metadata_push_memory_limit: 256M
 
@@ -116,15 +104,4 @@ eb_tos_url: "https://example.org"
 
 engine_site_notice_show: false
 
-# Backwards compatibility with older secrets files
-engineblock_private_keys:
-  default: "{{ engineblock_private_key }}"
-
-# Webdriver test settings
-engineblock_selenium_version: 2.53.1
-engineblock_selenium_install_dir: /opt
-
-# Composer
-composer_path: /usr/local/bin/composer
-
-engineblock_log_attributes: [] 
+engineblock_log_attributes: []

roles/engineblock/handlers/main.yml

@@ -1,9 +1,4 @@
 ---
-- name: restart php72-fpm
-  service:
-    name: php72-php-fpm
-    state: restarted
-
 - name: restart engine
   community.docker.docker_container:
     name: engine

roles/engineblock/tasks/main.yml

@@ -1,6 +1,3 @@
-- name: Include docker vars
-  ansible.builtin.include_vars: docker.yml
-
 - name: Add group engine
   ansible.builtin.group:
     name: "engine"
@@ -52,8 +49,7 @@
     mode: "0644"
     owner: root
     group: engine
-  when:
-    attributes_json_present.stat.exists
+  when: attributes_json_present.stat.exists
 
 - name: Check presence of language specific overrides
   ansible.builtin.stat:
@@ -89,8 +85,7 @@
     owner: root
     group: engine
     mode: "0644"
-  when:
-    customlogo.stat.exists
+  when: customlogo.stat.exists
 
 - name: Check if we have a custom favicon
   ansible.builtin.stat:
@@ -106,8 +101,7 @@
     owner: root
     group: root
     mode: "0644"
-  when:
-    customfavicon.stat.exists
+  when: customfavicon.stat.exists
 
 - name: Check if we have a custom background back image for the feedback page
   ansible.builtin.stat:
@@ -123,8 +117,7 @@
     owner: root
     group: engine
     mode: "0644"
-  when:
-    eb_customfeedbackbackground.stat.exists
+  when: eb_customfeedbackbackground.stat.exists
 
 - name: Check if we have a custom background front image for the feedback page
   ansible.builtin.stat:
@@ -140,8 +133,7 @@
     owner: root
     group: engine
     mode: "0644"
-  when:
-    eb_customfeedbackforeground.stat.exists
+  when: eb_customfeedbackforeground.stat.exists
 
 - name: Check if we have a Stepup GW certificate
   ansible.builtin.stat:
@@ -157,8 +149,7 @@
     owner: root
     group: engine
     mode: "0644"
-  when:
-    eb_stepupgwcert.stat.exists
+  when: eb_stepupgwcert.stat.exists
 
 - name: Copy over the engineblock keys
   ansible.builtin.copy: