Update to 2020-07-30 19:00

master
Daniel Berteaud 4 years ago
parent f858a99ebc
commit fe531bee9a
  1. 2
      roles/dokuwiki/defaults/main.yml
  2. 4
      roles/dokuwiki/files/authhttpldap/auth.php
  3. 2
      roles/dokuwiki/tasks/main.yml
  4. 1
      roles/dokuwiki/templates/local.protected.php.j2

@ -20,7 +20,7 @@ dokuwiki_archive_url: https://download.dokuwiki.org/src/dokuwiki/dokuwiki-{{ dok
# The user account under which PHP is executed # The user account under which PHP is executed
dokuwiki_php_user: php-dokuwiki_{{ dokuwiki_id }} dokuwiki_php_user: php-dokuwiki_{{ dokuwiki_id }}
dokuwiki_php_version: 72 dokuwiki_php_version: 74
# The name of the PHP-FPM pool to use # The name of the PHP-FPM pool to use
# dokuwiki_php_fpm_pool: php70 # dokuwiki_php_fpm_pool: php70

@ -21,7 +21,7 @@ class auth_plugin_authhttpldap extends auth_plugin_authldap {
// ldap extension is needed // ldap extension is needed
if(!function_exists('ldap_connect')) { if(!function_exists('ldap_connect')) {
$this->_debug("LDAP err: PHP LDAP extension not found.", -1, __LINE__, __FILE__); $this->debug("LDAP err: PHP LDAP extension not found.", -1, __LINE__, __FILE__);
$this->success = false; $this->success = false;
return; return;
} }
@ -49,7 +49,7 @@ class auth_plugin_authhttpldap extends auth_plugin_authldap {
$success = false; $success = false;
if (!isset($_SERVER['REMOTE_USER'])) return false; if (!isset($_SERVER['REMOTE_USER'])) return false;
$username = $_SERVER['REMOTE_USER']; $username = $_SERVER['REMOTE_USER'];
$this->_debug('HTTP User Name: '.htmlspecialchars($username),0,__LINE__,__FILE__); $this->debug('HTTP User Name: '.htmlspecialchars($username),0,__LINE__,__FILE__);
if (!empty($username)){ if (!empty($username)){
$USERINFO = $this->getUserData($username,true); $USERINFO = $this->getUserData($username,true);
if ($USERINFO !== false){ if ($USERINFO !== false){

@ -40,7 +40,7 @@
set_fact: dokuwiki_install_mode='upgrade' set_fact: dokuwiki_install_mode='upgrade'
when: when:
- dokuwiki_version_file.stat.exists - dokuwiki_version_file.stat.exists
- dokuwiki_current_version.stdout != dokuwiki_version - dokuwiki_current_version.stdout | string != dokuwiki_version | string
- dokuwiki_manage_upgrade - dokuwiki_manage_upgrade
tags: dokuwiki tags: dokuwiki

@ -9,6 +9,7 @@ $conf['plugin']['{{ dokuwiki_auth }}']['server'] = "{{ dokuwiki_ldap_uri }}";
$conf['plugin']['{{ dokuwiki_auth }}']['starttls'] = {{ dokuwiki_ldap_starttls | ternary('1','0') }}; $conf['plugin']['{{ dokuwiki_auth }}']['starttls'] = {{ dokuwiki_ldap_starttls | ternary('1','0') }};
$conf['plugin']['{{ dokuwiki_auth }}']['version'] = '3'; $conf['plugin']['{{ dokuwiki_auth }}']['version'] = '3';
$conf['plugin']['{{ dokuwiki_auth }}']['usertree'] = '{{ dokuwiki_ldap_user_base }}'; $conf['plugin']['{{ dokuwiki_auth }}']['usertree'] = '{{ dokuwiki_ldap_user_base }}';
$conf['plugin']['{{ dokuwiki_auth }}']['attributes'] = array();
$conf['plugin']['{{ dokuwiki_auth }}']['grouptree'] = '{{ dokuwiki_ldap_group_base }}'; $conf['plugin']['{{ dokuwiki_auth }}']['grouptree'] = '{{ dokuwiki_ldap_group_base }}';
$conf['plugin']['{{ dokuwiki_auth }}']['userfilter'] = '{{ dokuwiki_ldap_user_filter }}'; $conf['plugin']['{{ dokuwiki_auth }}']['userfilter'] = '{{ dokuwiki_ldap_user_filter }}';
$conf['plugin']['{{ dokuwiki_auth }}']['groupfilter'] = '{{ dokuwiki_ldap_group_filter }}'; $conf['plugin']['{{ dokuwiki_auth }}']['groupfilter'] = '{{ dokuwiki_ldap_group_filter }}';

Loading…
Cancel
Save