Merge branch 'master' into dist/eole/2.7.0/master
This commit is contained in:
commit
ffffd20b82
|
@ -44,14 +44,14 @@
|
|||
<installed>1</installed>
|
||||
<ldapAds>0</ldapAds>
|
||||
<ldapBase>%%ldap_base_dn</ldapBase>
|
||||
<ldapBindPass>%%pwdreader("", %%rdap_reader_passfile)</ldapBindPass>
|
||||
<ldapBindPass>%%pwdreader("", %%ldap_reader_passfile)</ldapBindPass>
|
||||
<ldapBindUser>%%ldap_reader</ldapBindUser>
|
||||
<ldapDefaultGroup></ldapDefaultGroup>
|
||||
<ldapDefaultProfile></ldapDefaultProfile>
|
||||
<ldapEnabled>1</ldapEnabled>
|
||||
<ldapGroup></ldapGroup>
|
||||
<ldapProxyUser></ldapProxyUser>
|
||||
<ldapServer>ldap://%%adress_ip_ldap</ldapServer>
|
||||
<ldapServer>ldap://%%adresse_ip_ldap</ldapServer>
|
||||
<ldapTlsEnabled>0</ldapTlsEnabled>
|
||||
<ldapType></ldapType>
|
||||
<logEnabled>1</logEnabled>
|
||||
|
|
|
@ -24,7 +24,9 @@ createscript: "/usr/share/eole/db/syspass/gen/0_eole-syspass.sql"
|
|||
sqlscripts: ["/usr/share/eole/db/syspass/gen/dbstructure.sql"]
|
||||
updatescripts: []
|
||||
pwd_files:
|
||||
- {file: '%%container_path_web/var/www/html/syspass/app/config/config.php',
|
||||
pattern: " 'dbpass' => '",
|
||||
- {file: '%%container_path_web/var/www/html/syspass/app/config/config.xml',
|
||||
type: 'xml',
|
||||
pattern: " <dbPass>",
|
||||
end_pattern: "</dbPass>",
|
||||
owner: 'www-data:www-data',
|
||||
mod: '540'}
|
||||
mod: '700'}
|
||||
|
|
Loading…
Reference in New Issue