Cadoles
/
eole-syspass
18
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into dist/eole/2.7.0/master

This commit is contained in:
Benjamin Bohard 2019-08-13 15:43:03 +02:00
parent 72253d073b fa4207f4fe
commit ffffd20b82
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmpl/syspass-config.xml
View File

@ -44,14 +44,14 @@
<installed>1</installed> <installed>1</installed>
<ldapAds>0</ldapAds> <ldapAds>0</ldapAds>
<ldapBase>%%ldap_base_dn</ldapBase> <ldapBase>%%ldap_base_dn</ldapBase>
<ldapBindPass>%%pwdreader("", %%rdap_reader_passfile)</ldapBindPass> <ldapBindPass>%%pwdreader("", %%ldap_reader_passfile)</ldapBindPass>
<ldapBindUser>%%ldap_reader</ldapBindUser> <ldapBindUser>%%ldap_reader</ldapBindUser>
<ldapDefaultGroup></ldapDefaultGroup> <ldapDefaultGroup></ldapDefaultGroup>
<ldapDefaultProfile></ldapDefaultProfile> <ldapDefaultProfile></ldapDefaultProfile>
<ldapEnabled>1</ldapEnabled> <ldapEnabled>1</ldapEnabled>
<ldapGroup></ldapGroup> <ldapGroup></ldapGroup>
<ldapProxyUser></ldapProxyUser> <ldapProxyUser></ldapProxyUser>
<ldapServer>ldap://%%adress_ip_ldap</ldapServer> <ldapServer>ldap://%%adresse_ip_ldap</ldapServer>
<ldapTlsEnabled>0</ldapTlsEnabled> <ldapTlsEnabled>0</ldapTlsEnabled>
<ldapType></ldapType> <ldapType></ldapType>
<logEnabled>1</logEnabled> <logEnabled>1</logEnabled>

8
tmpl/syspass.yml
View File

@ -24,7 +24,9 @@ createscript: "/usr/share/eole/db/syspass/gen/0_eole-syspass.sql"
sqlscripts: ["/usr/share/eole/db/syspass/gen/dbstructure.sql"] sqlscripts: ["/usr/share/eole/db/syspass/gen/dbstructure.sql"]
updatescripts: [] updatescripts: []
pwd_files: pwd_files:
- {file: '%%container_path_web/var/www/html/syspass/app/config/config.php', - {file: '%%container_path_web/var/www/html/syspass/app/config/config.xml',
pattern: " 'dbpass' => '", type: 'xml',
pattern: " <dbPass>",
end_pattern: "</dbPass>",
owner: 'www-data:www-data', owner: 'www-data:www-data',
mod: '540'} mod: '700'}