Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

This commit is contained in:
Emmanuel Garette 2020-11-14 17:48:58 +01:00
commit 40ea7d186b
2 changed files with 6 additions and 6 deletions

View File

@ -19,17 +19,17 @@
</variable>
<variable name='lemur_admin_password' type='password' description="Mot de passe de l'utilisateur admin de Lemur" auto_save="True"/>
<variable name='lemur_admin_email' type='mail' description="Adresse courriel d'administration de Lemur" mandatory="True"/>
<variable name='lemur_default_country' type='' description="" mandatory="True">
<variable name='lemur_default_country' type='string' description="" mandatory="True">
<value>FR</value>
</variable>
<variable name='lemur_default_state' type='' description="" mandatory="True">
<variable name='lemur_default_state' type='string' description="" mandatory="True">
<value>Bourgogne</value>
</variable>
<variable name='lemur_default_location' type='' description="" mandatory="True">
<variable name='lemur_default_location' type='string' description="" mandatory="True">
<value>Dijon</value>
</variable>
<variable name='lemur_default_organization' type='' description="" mandatory="True"/>
<variable name='lemur_default_organization_unit' type='' description="" mandatory="True"/>
<variable name='lemur_default_organization' type='string' description="" mandatory="True"/>
<variable name='lemur_default_organization_unit' type='string' description="" mandatory="True"/>
</family>
</variables>
<constraints>

View File

@ -3,7 +3,7 @@ Description=Lemur
After=postgresql.service
[Service]
ExecStart=/usr/bin/lemur start -b 127.0.0.1:8002 -c /etc/lemur/lemur.conf.py
ExecStart=/usr/bin/lemur -c /etc/lemur/lemur.conf.py start -b 127.0.0.1:8002
User=lemur
Group=lemur