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

This commit is contained in:
Benjamin Bohard 2019-08-13 14:23:51 +02:00
commit 72253d073b
3 changed files with 100 additions and 4 deletions

View File

@ -3,7 +3,7 @@
<files> <files>
<!-- service de sauvegarde Bacula --> <!-- service de sauvegarde Bacula -->
<file filelist='syspass-bacula' name='/etc/bacula/baculafichiers.d/syspass.conf' source='syspass-bacula.conf' rm='True'/> <file filelist='syspass-bacula' name='/etc/bacula/baculafichiers.d/syspass.conf' source='syspass-bacula.conf' rm='True'/>
<file filelist='syspass_files' name='/usr/share/eole/mysql/eole-syspass/gen/create-database.sql' source='syspass-create-database.sql' rm='True' mkdir='True'/> <file filelist='syspass_files' name='/etc/eole/eole-db.d/syspass.yml' rm='True' mkdir='True'/>
</files> </files>
<containers> <containers>
<container name='web'> <container name='web'>
@ -12,7 +12,7 @@
<service method="apache" servicelist="syspass">syspass</service> <service method="apache" servicelist="syspass">syspass</service>
<!-- fichiers de conf apache --> <!-- fichiers de conf apache -->
<file filelist='syspass_files' name='/etc/apache2/sites-available/syspass' source='syspass-apache.conf' /> <file filelist='syspass_files' name='/etc/apache2/sites-available/syspass' source='syspass-apache.conf' />
<file filelist='syspass_files' name='/usr/share/sysPass/config/config.php' source='syspass-config.php' rm='True'/> <file filelist='syspass_files' name='/var/www/html/syspass/app/config/config.xml' source='syspass-config.xml' rm='True'/>
</container> </container>
</containers> </containers>
<variables> <variables>

View File

@ -1,6 +1,6 @@
%set %%allowed_networks = ' '.join(['/'.join([%%str(ip), ip.syspass_allowed_netmask]) for ip in %%getVar('syspass_allowed_ip', [])]) %set %%allowed_networks = ' '.join(['/'.join([%%str(ip), ip.syspass_allowed_netmask]) for ip in %%getVar('syspass_allowed_ip', [])])
Alias /syspass /usr/share/sysPass Alias /syspass /var/www/html/syspass
<Directory "/usr/share/sysPass"> <Directory "/var/www/html/syspass">
DirectoryIndex index.php DirectoryIndex index.php
Order Deny,Allow Order Deny,Allow
Deny from All Deny from All

96
tmpl/syspass-config.xml Normal file
View File

@ -0,0 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<config>
<accountCount>12</accountCount>
<accountExpireEnabled>0</accountExpireEnabled>
<accountExpireTime>10368000</accountExpireTime>
<accountFullGroupAccess>0</accountFullGroupAccess>
<accountLink>1</accountLink>
<accountPassToImage>0</accountPassToImage>
<appVersion></appVersion>
<applicationUrl></applicationUrl>
<authBasicAutoLoginEnabled>1</authBasicAutoLoginEnabled>
<authBasicDomain></authBasicDomain>
<authBasicEnabled>1</authBasicEnabled>
<backup_hash></backup_hash>
<checkUpdates>0</checkUpdates>
<checknotices>0</checknotices>
<configDate>1565697842</configDate>
<configHash>9e4954e3d6a7d207db3e103b34fb3e476b450313</configHash>
<configSaver>sysPass</configSaver>
<configVersion></configVersion>
<databaseVersion></databaseVersion>
<dbHost>%%adresse_ip_mysql</dbHost>
<dbName>syspass</dbName>
<dbPass>syspass</dbPass>
<dbPort>3306</dbPort>
<dbSocket></dbSocket>
<dbUser>syspass</dbUser>
<debug>0</debug>
<demoEnabled>0</demoEnabled>
<dokuwikiEnabled>0</dokuwikiEnabled>
<dokuwikiNamespace></dokuwikiNamespace>
<dokuwikiPass></dokuwikiPass>
<dokuwikiUrl></dokuwikiUrl>
<dokuwikiUrlBase></dokuwikiUrlBase>
<dokuwikiUser></dokuwikiUser>
<encryptSession>0</encryptSession>
<export_hash></export_hash>
<filesAllowedExts/>
<filesAllowedMime/>
<filesAllowedSize>1024</filesAllowedSize>
<filesEnabled>1</filesEnabled>
<globalSearch>1</globalSearch>
<httpsEnabled>1</httpsEnabled>
<installed>1</installed>
<ldapAds>0</ldapAds>
<ldapBase>%%ldap_base_dn</ldapBase>
<ldapBindPass>%%pwdreader("", %%rdap_reader_passfile)</ldapBindPass>
<ldapBindUser>%%ldap_reader</ldapBindUser>
<ldapDefaultGroup></ldapDefaultGroup>
<ldapDefaultProfile></ldapDefaultProfile>
<ldapEnabled>1</ldapEnabled>
<ldapGroup></ldapGroup>
<ldapProxyUser></ldapProxyUser>
<ldapServer>ldap://%%adress_ip_ldap</ldapServer>
<ldapTlsEnabled>0</ldapTlsEnabled>
<ldapType></ldapType>
<logEnabled>1</logEnabled>
<logEvents/>
<mailAuthenabled>0</mailAuthenabled>
<mailEnabled>0</mailEnabled>
<mailEvents/>
<mailFrom></mailFrom>
<mailPass></mailPass>
<mailPort>25</mailPort>
<mailRecipients/>
<mailRequestsEnabled>0</mailRequestsEnabled>
<mailSecurity></mailSecurity>
<mailServer></mailServer>
<mailUser></mailUser>
<maintenance>0</maintenance>
<passwordSalt>a89a4d7bee43cd3e5484598756b1a52f29fd098c94de862ec4df5d7f1025</passwordSalt>
<proxyEnabled>0</proxyEnabled>
<proxyPass></proxyPass>
<proxyPort>8080</proxyPort>
<proxyServer></proxyServer>
<proxyUser></proxyUser>
<publinksEnabled>0</publinksEnabled>
<publinksImageEnabled>0</publinksImageEnabled>
<publinksMaxTime>600</publinksMaxTime>
<publinksMaxViews>3</publinksMaxViews>
<resultsAsCards>0</resultsAsCards>
<sessionTimeout>300</sessionTimeout>
<siteLang></siteLang>
<siteTheme>material-blue</siteTheme>
<ssoDefaultGroup></ssoDefaultGroup>
<ssoDefaultProfile></ssoDefaultProfile>
<syslogEnabled>0</syslogEnabled>
<syslogPort>514</syslogPort>
<syslogRemoteEnabled>0</syslogRemoteEnabled>
<syslogServer></syslogServer>
<upgradeKey></upgradeKey>
<wikiEnabled>0</wikiEnabled>
<wikiFilter/>
<wikiPageurl></wikiPageurl>
<wikiSearchurl></wikiSearchurl>
</config>