From 353dd003f87846ebebfb7e533b571897c85961af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Thu, 24 Mar 2022 15:35:48 +0100 Subject: [PATCH] CA certifikat, LDAP nastavitve --- .ddev/config.yaml | 4 +- .gitignore | 6 + ca_server.pem | 24 + composer.json | 1 + composer.lock | 598 +++++++++++++++++- ...R_H4oeR5NULOZ6x0uU3iTIT4dDi_z56R6YlTYVw.js | 1 - .../files/sync/contact.form.feedback.yml | 14 - .../files/sync/contact.form.personal.yml | 13 - .../default/files/sync/contact.settings.yml | 8 - .../default/files/sync/core.extension.yml | 7 +- web/sites/default/files/sync/system.date.yml | 4 +- web/sites/default/files/sync/system.site.yml | 6 +- .../files/sync/user.role.anonymous.yml | 2 - .../files/sync/user.role.authenticated.yml | 2 - web/sites/default/settings.php | 9 +- 15 files changed, 646 insertions(+), 53 deletions(-) create mode 100644 ca_server.pem delete mode 100644 web/sites/default/files/languages/sl_p00zR_H4oeR5NULOZ6x0uU3iTIT4dDi_z56R6YlTYVw.js delete mode 100644 web/sites/default/files/sync/contact.form.feedback.yml delete mode 100644 web/sites/default/files/sync/contact.form.personal.yml delete mode 100644 web/sites/default/files/sync/contact.settings.yml diff --git a/.ddev/config.yaml b/.ddev/config.yaml index edbb453d..201486f7 100644 --- a/.ddev/config.yaml +++ b/.ddev/config.yaml @@ -6,7 +6,7 @@ webserver_type: nginx-fpm router_http_port: "80" router_https_port: "443" xdebug_enabled: false -additional_hostnames: [] +additional_hostnames: ['np-ldap'] additional_fqdns: [] mariadb_version: "10.3" mysql_version: "" @@ -82,7 +82,7 @@ web_environment: [] # Please take care with this because it can cause great confusion. # upload_dir: custom/upload/dir -# would set the destination path for ddev import-files to /custom/upload/dir +# would set the destination path for ddev import-files to /custom/upload/dir # working_dir: # web: /var/www/html diff --git a/.gitignore b/.gitignore index 70e6bd6b..578d64a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,8 @@ vendor/ web/sites/default/files/* +web/sites/default/settings.local.php +web/modules/contrib/ + +# Emacs lock fajli +\#*\# +.#* diff --git a/ca_server.pem b/ca_server.pem new file mode 100644 index 00000000..3bacf1fd --- /dev/null +++ b/ca_server.pem @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIIEGTCCAoGgAwIBAgIUZUqarjcK3GLWOfEcTIeSi9hjOmYwDQYJKoZIhvcNAQEL +BQAwJDEiMCAGA1UEAxMZTmEgcHJvc3RlbSBMREFQIFNlcnZlciBDQTAeFw0yMjAz +MTExOTIxMTVaFw0yMzAzMTExOTIxMTVaMCQxIjAgBgNVBAMTGU5hIHByb3N0ZW0g +TERBUCBTZXJ2ZXIgQ0EwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDJ +e0e5hGliS/XQZ1qApbcj9EA4FFv8HYSy0FGx+acqoDXi+miW4UPlMg5IJ/C+U/AM +8H7HVp6VL7ZRYn6sOVzyqZodlzx974omfWoPfyDn2uN9VM9kzfBvY267JaoyiHGm +pCLdC+Kuy4xl6GlgiMGIZ3IXxm0gHXC9YuN6+e0fg12CZpyksDPUkW/B9RJj9Kdl +6CN39vgXZIn1x86V1Xuur1/ALe/SwuYxrY0G2Z7wUPcYMZynzKU+NHp9oe+o1kt/ +bKi2KwNCbnMt3J0gJbdgKLMZ36HL4+u7QPkByIbqSfdEJTCC/ZxD9wJpWpn2yBaQ +twKYYBV5ruKRXQAdrrmr/ZKEspSEf1EI6mrvPNl7Q1rApWw3omrWqg+OfLi+lZi+ +IVDOXWPExM8uwvcr+5146/s5U9WRU2WEVMu17wFRd1Yd+bz1vge1iaLq6mtLYvTt +bR/fS95sR/LlHqNUpd6tEJb77a2hDRKURyQxP/WsmCbjboKnOGNy3qa31HNZtl0C +AwEAAaNDMEEwDwYDVR0TAQH/BAUwAwEB/zAPBgNVHQ8BAf8EBQMDBwQAMB0GA1Ud +DgQWBBQ+mp9VORk1ckHp/26MO3M7SF2rwzANBgkqhkiG9w0BAQsFAAOCAYEAmYVm +f9/7hQ2RX61LxI4ArBxypCiloejCUWU5qoyohXCNBnNBxCULveb5KwkPZ34wWWVD +0+jF1lue2xCqaO89+NQiNuFptsTZ4DjFChzTvtOJi8mBmkJdFcgDZN5N6L8+POR9 +X6zeeA1AQW6wDm0igdqIiYSlOvoy7fzBrC+p7N9kjku4AxDW0qsDBnl3VvSVgtU3 +UPnNVn4De6JMzeMVCN9EjMgPtjNEb87MjZbPqF/N/O7icL2Fxmlm/gumTl+v7xM8 +QDEBVSxG6WfsFMXoIysXKaqWH3omuZDBykTXVKA/QWH1jZvaVNVxC6RTDWsIzO5k +nH8+2DmZv42xca6SLRgfdgjlzOweORLDJhfWnNpTzF4/sFOjj5e1Ll0JRtoZl6yo +9CIM5jF3qfSHTTWz1iqlM2GJIaaq9z83CODvyBrLlVNlqyF4l0DdG4PrzRZbiPgj +78BW+R+acKpGALQ4/tXYJ2/Qk4CRCBmKYNo+Y5zbbfNUmXzq9Gm7oeAag2U8 +-----END CERTIFICATE----- diff --git a/composer.json b/composer.json index f34fc05d..5e34e2e7 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ "drupal/core-composer-scaffold": "^9.3", "drupal/core-project-message": "^9.3", "drupal/core-recommended": "^9.3", + "drupal/ldap_sso_auth": "^2.1", "drush/drush": "^11.0" }, "conflict": { diff --git a/composer.lock b/composer.lock index f321c655..771f4dee 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "50f60e9e274307dfd2d31bb04aa1273e", + "content-hash": "bfc243b8893b83111f420b4f419cab28", "packages": [ { "name": "asm89/stack-cors", @@ -1269,6 +1269,63 @@ "issues": "https://www.drupal.org/project/issues/admin_toolbar" } }, + { + "name": "drupal/authorization", + "version": "1.0.0-beta6", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/authorization.git", + "reference": "8.x-1.0-beta6" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/authorization-8.x-1.0-beta6.zip", + "reference": "8.x-1.0-beta6", + "shasum": "c83b3b4ec67496dd87d8bb556b597b4d0989e9f7" + }, + "require": { + "drupal/core": "^8.7.7 || ^9", + "drupal/externalauth": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.0-beta6", + "datestamp": "1631389169", + "security-coverage": { + "status": "not-covered", + "message": "Project has not opted into security advisory coverage!" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "grahl", + "homepage": "https://www.drupal.org/user/146040" + }, + { + "name": "johnbarclay", + "homepage": "https://www.drupal.org/user/225037" + }, + { + "name": "queenvictoria", + "homepage": "https://www.drupal.org/user/856454" + }, + { + "name": "webflo", + "homepage": "https://www.drupal.org/user/254778" + } + ], + "description": "An abstraction layer for providers and consumers of authorizations.", + "homepage": "https://www.drupal.org/project/authorization", + "support": { + "source": "https://git.drupalcode.org/project/authorization" + } + }, { "name": "drupal/core", "version": "9.3.8", @@ -1691,6 +1748,414 @@ ], "description": "Locked core dependencies; require this project INSTEAD OF drupal/core." }, + { + "name": "drupal/externalauth", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/externalauth.git", + "reference": "8.x-1.4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/externalauth-8.x-1.4.zip", + "reference": "8.x-1.4", + "shasum": "caea7d2d5a890adad9e6b5beaa2cf139727266d6" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.4", + "datestamp": "1624457496", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "rgristroph", + "homepage": "https://www.drupal.org/user/516442" + }, + { + "name": "snufkin", + "homepage": "https://www.drupal.org/user/58645" + }, + { + "name": "svendecabooter", + "homepage": "https://www.drupal.org/user/35369" + } + ], + "description": "Helper module to authenticate users using an external site / service and storing identification details", + "homepage": "https://www.drupal.org/project/externalauth", + "support": { + "source": "https://git.drupalcode.org/project/externalauth" + } + }, + { + "name": "drupal/ldap", + "version": "4.3.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/ldap.git", + "reference": "8.x-4.3" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/ldap-8.x-4.3.zip", + "reference": "8.x-4.3", + "shasum": "f26b17614a1eed11d54a9dea9537593fe4096360" + }, + "require": { + "drupal/authorization": "^1.0", + "drupal/core": "^8.7.7 || ^9", + "drupal/externalauth": "^1.0", + "drupal/ldap_servers": "*", + "grahl/ldap": "^5.2", + "php": ">=7.2.0" + }, + "require-dev": { + "drupal/authorization": "*", + "drupal/externalauth": "*", + "drupal/ldap_query": "*", + "drupal/ldap_servers": "*", + "drupal/ldap_user": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-4.3", + "datestamp": "1641412019", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "dgtlmoon", + "homepage": "https://www.drupal.org/user/25027" + }, + { + "name": "grahl", + "homepage": "https://www.drupal.org/user/146040" + }, + { + "name": "johnbarclay", + "homepage": "https://www.drupal.org/user/225037" + }, + { + "name": "larowlan", + "homepage": "https://www.drupal.org/user/395439" + }, + { + "name": "queenvictoria", + "homepage": "https://www.drupal.org/user/856454" + }, + { + "name": "welly", + "homepage": "https://www.drupal.org/user/354705" + } + ], + "description": "Lightweight Directory Access Protocol (LDAP)", + "homepage": "https://www.drupal.org/project/ldap", + "support": { + "source": "https://git.drupalcode.org/project/ldap" + } + }, + { + "name": "drupal/ldap_authentication", + "version": "4.3.0", + "require": { + "drupal/core": "^8.7.7 || ^9", + "drupal/externalauth": "*", + "drupal/ldap": "^4", + "drupal/ldap_servers": "*", + "drupal/ldap_user": "*" + }, + "type": "metapackage", + "extra": { + "drupal": { + "version": "8.x-4.3", + "datestamp": "1641412019", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "dgtlmoon", + "homepage": "https://www.drupal.org/user/25027" + }, + { + "name": "grahl", + "homepage": "https://www.drupal.org/user/146040" + }, + { + "name": "johnbarclay", + "homepage": "https://www.drupal.org/user/225037" + }, + { + "name": "larowlan", + "homepage": "https://www.drupal.org/user/395439" + }, + { + "name": "queenvictoria", + "homepage": "https://www.drupal.org/user/856454" + }, + { + "name": "welly", + "homepage": "https://www.drupal.org/user/354705" + } + ], + "description": "Implements LDAP authentication", + "homepage": "https://www.drupal.org/project/ldap", + "support": { + "source": "https://git.drupalcode.org/project/ldap" + } + }, + { + "name": "drupal/ldap_query", + "version": "4.3.0", + "require": { + "drupal/core": "^8.7.7 || ^9", + "drupal/ldap": "^4", + "drupal/ldap_servers": "*" + }, + "type": "metapackage", + "extra": { + "drupal": { + "version": "8.x-4.3", + "datestamp": "1641412019", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "dgtlmoon", + "homepage": "https://www.drupal.org/user/25027" + }, + { + "name": "grahl", + "homepage": "https://www.drupal.org/user/146040" + }, + { + "name": "johnbarclay", + "homepage": "https://www.drupal.org/user/225037" + }, + { + "name": "larowlan", + "homepage": "https://www.drupal.org/user/395439" + }, + { + "name": "queenvictoria", + "homepage": "https://www.drupal.org/user/856454" + }, + { + "name": "welly", + "homepage": "https://www.drupal.org/user/354705" + } + ], + "description": "LDAP Query Builder and Storage for queries used by other LDAP modules such as LDAP feeds, LDAP provision, etc", + "homepage": "https://www.drupal.org/project/ldap", + "support": { + "source": "https://git.drupalcode.org/project/ldap" + } + }, + { + "name": "drupal/ldap_servers", + "version": "4.3.0", + "require": { + "drupal/core": "^8.7.7 || ^9", + "drupal/externalauth": "*", + "drupal/ldap": "^4" + }, + "type": "metapackage", + "extra": { + "drupal": { + "version": "8.x-4.3", + "datestamp": "1641412019", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "dgtlmoon", + "homepage": "https://www.drupal.org/user/25027" + }, + { + "name": "grahl", + "homepage": "https://www.drupal.org/user/146040" + }, + { + "name": "johnbarclay", + "homepage": "https://www.drupal.org/user/225037" + }, + { + "name": "larowlan", + "homepage": "https://www.drupal.org/user/395439" + }, + { + "name": "queenvictoria", + "homepage": "https://www.drupal.org/user/856454" + }, + { + "name": "welly", + "homepage": "https://www.drupal.org/user/354705" + } + ], + "description": "Implements LDAP Server Configuration", + "homepage": "https://www.drupal.org/project/ldap", + "support": { + "source": "https://git.drupalcode.org/project/ldap" + } + }, + { + "name": "drupal/ldap_sso_auth", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/ldap_sso_auth.git", + "reference": "8.x-2.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/ldap_sso_auth-8.x-2.1.zip", + "reference": "8.x-2.1", + "shasum": "898ffc6a724413903ee308d37ab4d13215890d2e" + }, + "require": { + "drupal/core": "^8 || ^9", + "drupal/ldap": "^4.0", + "drupal/ldap_authentication": "*", + "drupal/ldap_servers": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-2.1", + "datestamp": "1594274655", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Dudas Jozsef", + "homepage": "https://www.drupal.org/user/387119", + "email": "dj@brainsum.com" + }, + { + "name": "pedrop", + "homepage": "https://www.drupal.org/user/1043368" + }, + { + "name": "szato", + "homepage": "https://www.drupal.org/user/389677" + } + ], + "description": "This is the LDAP SSO Auth module.", + "homepage": "https://www.drupal.org/project/ldap_sso_auth", + "support": { + "source": "https://git.drupalcode.org/project/ldap_sso_auth" + } + }, + { + "name": "drupal/ldap_user", + "version": "4.3.0", + "require": { + "drupal/core": "^8.7.7 || ^9", + "drupal/externalauth": "*", + "drupal/ldap": "^4", + "drupal/ldap_query": "*", + "drupal/ldap_servers": "*" + }, + "type": "metapackage", + "extra": { + "drupal": { + "version": "8.x-4.3", + "datestamp": "1641412019", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "dgtlmoon", + "homepage": "https://www.drupal.org/user/25027" + }, + { + "name": "grahl", + "homepage": "https://www.drupal.org/user/146040" + }, + { + "name": "johnbarclay", + "homepage": "https://www.drupal.org/user/225037" + }, + { + "name": "larowlan", + "homepage": "https://www.drupal.org/user/395439" + }, + { + "name": "queenvictoria", + "homepage": "https://www.drupal.org/user/856454" + }, + { + "name": "welly", + "homepage": "https://www.drupal.org/user/354705" + } + ], + "description": "Module for LDAP identified users. User may be associated via LDAP authentication, LDAP authorization, or from account provisioning. Configures syncing of LDAP entries to Drupal user properties, fields and the opposite direction.", + "homepage": "https://www.drupal.org/project/ldap", + "support": { + "source": "https://git.drupalcode.org/project/ldap" + } + }, { "name": "drush/drush", "version": "11.0.7", @@ -1967,6 +2432,66 @@ }, "time": "2022-02-21T22:40:16+00:00" }, + { + "name": "grahl/ldap", + "version": "v5.2.0.1", + "source": { + "type": "git", + "url": "https://github.com/grahl/ldap.git", + "reference": "92efd7cd2c0612c6a0518bc5ca98408b6ab4a269" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/grahl/ldap/zipball/92efd7cd2c0612c6a0518bc5ca98408b6ab4a269", + "reference": "92efd7cd2c0612c6a0518bc5ca98408b6ab4a269", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/options-resolver": "^4.4|^5.0", + "symfony/polyfill-php80": "^1.15" + }, + "conflict": { + "symfony/options-resolver": "<4.4", + "symfony/security-core": "<5" + }, + "require-dev": { + "symfony/security-core": "^5.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Ldap\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Charles Sarrazin", + "email": "charles@sarraz.in" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "An abstraction in front of PHP's LDAP functions, compatible with PHP 5.3.9 onwards.", + "homepage": "https://symfony.com", + "keywords": [ + "active directory", + "ldap" + ], + "support": { + "source": "https://github.com/grahl/ldap/tree/v5.2.0.1" + }, + "time": "2020-12-12T23:32:37+00:00" + }, { "name": "grasmash/expander", "version": "2.0.2", @@ -4397,6 +4922,75 @@ ], "time": "2021-11-23T10:19:22+00:00" }, + { + "name": "symfony/options-resolver", + "version": "v5.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8", + "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php73": "~1.0", + "symfony/polyfill-php80": "^1.16" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an improved replacement for the array_replace PHP function", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "support": { + "source": "https://github.com/symfony/options-resolver/tree/v5.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" + }, { "name": "symfony/polyfill-ctype", "version": "v1.23.0", @@ -6295,5 +6889,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } diff --git a/web/sites/default/files/languages/sl_p00zR_H4oeR5NULOZ6x0uU3iTIT4dDi_z56R6YlTYVw.js b/web/sites/default/files/languages/sl_p00zR_H4oeR5NULOZ6x0uU3iTIT4dDi_z56R6YlTYVw.js deleted file mode 100644 index 8aaa0415..00000000 --- a/web/sites/default/files/languages/sl_p00zR_H4oeR5NULOZ6x0uU3iTIT4dDi_z56R6YlTYVw.js +++ /dev/null @@ -1 +0,0 @@ -window.drupalTranslations = {"strings":{"":{"Please wait...":"Prosimo po\u010dakajte...","Home":"Domov","Next":"Naslednja","closed":"zaprto","Open":"Odprto","Close":"Zapri","Show":"Prika\u017ei","Select all rows in this table":"Ozna\u010di vse vrstice v tej tabeli","Deselect all rows in this table":"Odzna\u010di vse vrstice v tej tabeli","Hide":"Skrij","Error message":"Sporo\u010dilo o napaki","Warning message":"Opozorilno sporo\u010dilo"}},"pluralFormula":{"1":0,"2":1,"3":2,"4":2,"101":0,"102":1,"103":2,"104":2,"default":3}}; \ No newline at end of file diff --git a/web/sites/default/files/sync/contact.form.feedback.yml b/web/sites/default/files/sync/contact.form.feedback.yml deleted file mode 100644 index 20da1a88..00000000 --- a/web/sites/default/files/sync/contact.form.feedback.yml +++ /dev/null @@ -1,14 +0,0 @@ -uuid: 79aca818-3124-4a65-ac17-eade9e4ea2ed -langcode: sl -status: true -dependencies: { } -_core: - default_config_hash: vymHlgJy26BuI5GGj9-IXjwR3dRC5C0tij4BpWJnoqw -id: feedback -label: 'Website feedback' -recipients: - - admin@example.com -reply: '' -weight: 0 -message: 'Vaše sporočilo je bilo poslano.' -redirect: '' diff --git a/web/sites/default/files/sync/contact.form.personal.yml b/web/sites/default/files/sync/contact.form.personal.yml deleted file mode 100644 index 06d7e821..00000000 --- a/web/sites/default/files/sync/contact.form.personal.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: 1dc79332-6944-4d99-8a61-f1d1aca6a7de -langcode: sl -status: true -dependencies: { } -_core: - default_config_hash: jonvgt3CkUM2eMLTFwWfHileWWDC4YtXCuIlCahTk_I -id: personal -label: 'Osebni obrazec za kontakt' -recipients: { } -reply: '' -weight: 0 -message: 'Vaše sporočilo je bilo poslano.' -redirect: '' diff --git a/web/sites/default/files/sync/contact.settings.yml b/web/sites/default/files/sync/contact.settings.yml deleted file mode 100644 index 49277620..00000000 --- a/web/sites/default/files/sync/contact.settings.yml +++ /dev/null @@ -1,8 +0,0 @@ -_core: - default_config_hash: U69DBeuvXuNVOC15rVNaBjDPK2fWFbo9v4takdYSSO8 -langcode: sl -default_form: feedback -flood: - limit: 5 - interval: 3600 -user_default_enabled: true diff --git a/web/sites/default/files/sync/core.extension.yml b/web/sites/default/files/sync/core.extension.yml index 551e5bfa..c2f1edf9 100644 --- a/web/sites/default/files/sync/core.extension.yml +++ b/web/sites/default/files/sync/core.extension.yml @@ -12,7 +12,6 @@ module: color: 0 comment: 0 config: 0 - contact: 0 contextual: 0 datetime: 0 dblog: 0 @@ -26,6 +25,11 @@ module: history: 0 image: 0 language: 0 + ldap_authentication: 0 + ldap_query: 0 + ldap_servers: 0 + ldap_sso_auth: 0 + ldap_user: 0 link: 0 locale: 0 menu_link_content: 0 @@ -46,6 +50,7 @@ module: tour: 0 user: 0 views_ui: 0 + externalauth: 10 views: 10 theme: bartik: 0 diff --git a/web/sites/default/files/sync/system.date.yml b/web/sites/default/files/sync/system.date.yml index d6d458ae..523e71ef 100644 --- a/web/sites/default/files/sync/system.date.yml +++ b/web/sites/default/files/sync/system.date.yml @@ -3,9 +3,9 @@ _core: langcode: sl first_day: 0 country: - default: '' + default: SI timezone: - default: '' + default: Europe/Ljubljana user: configurable: true default: 0 diff --git a/web/sites/default/files/sync/system.site.yml b/web/sites/default/files/sync/system.site.yml index 40df44fe..9fe50517 100644 --- a/web/sites/default/files/sync/system.site.yml +++ b/web/sites/default/files/sync/system.site.yml @@ -2,13 +2,13 @@ _core: default_config_hash: VDJxTZtQR21qB4lvOq8zszJZLvLKrSPQpdn2E3T71Ww langcode: sl uuid: 145ce471-bad9-44d0-93e2-3890ec2ff06a -name: Drupal -mail: '' +name: 'Na prostem' +mail: noreply@naprostem.si slogan: '' page: 403: '' 404: '' - front: /node + front: /node/1 admin_compact_mode: false weight_select_max: 100 default_langcode: sl diff --git a/web/sites/default/files/sync/user.role.anonymous.yml b/web/sites/default/files/sync/user.role.anonymous.yml index 6c1dfc93..5abb9eed 100644 --- a/web/sites/default/files/sync/user.role.anonymous.yml +++ b/web/sites/default/files/sync/user.role.anonymous.yml @@ -6,7 +6,6 @@ dependencies: - filter.format.restricted_html module: - comment - - contact - filter - search - system @@ -19,6 +18,5 @@ is_admin: false permissions: - 'access comments' - 'access content' - - 'access site-wide contact form' - 'search content' - 'use text format restricted_html' diff --git a/web/sites/default/files/sync/user.role.authenticated.yml b/web/sites/default/files/sync/user.role.authenticated.yml index cbc3d75f..47bea304 100644 --- a/web/sites/default/files/sync/user.role.authenticated.yml +++ b/web/sites/default/files/sync/user.role.authenticated.yml @@ -6,7 +6,6 @@ dependencies: - filter.format.basic_html module: - comment - - contact - filter - search - shortcut @@ -21,7 +20,6 @@ permissions: - 'access comments' - 'access content' - 'access shortcuts' - - 'access site-wide contact form' - 'post comments' - 'search content' - 'skip comment approval' diff --git a/web/sites/default/settings.php b/web/sites/default/settings.php index 73415f43..0458d04e 100755 --- a/web/sites/default/settings.php +++ b/web/sites/default/settings.php @@ -775,6 +775,9 @@ if (file_exists(__DIR__ . '/settings.ddev.php') && getenv('IS_DDEV_PROJECT') == * Keep this code block at the end of this file to take full effect. */ # -# if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) { -# include $app_root . '/' . $site_path . '/settings.local.php'; -# } +if (file_exists($app_root . '/' . $site_path . '/settings.local.php')) { + include $app_root . '/' . $site_path . '/settings.local.php'; +} +// DEBUG! +// ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, 7); +// ldap_set_option(null, LDAP_OPT_X_TLS_CACERTFILE, '/var/www/html/ca_server.pem');