Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop
This commit is contained in:
commit
40ea7d186b
|
@ -19,17 +19,17 @@
|
||||||
</variable>
|
</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_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_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>
|
<value>FR</value>
|
||||||
</variable>
|
</variable>
|
||||||
<variable name='lemur_default_state' type='' description="" mandatory="True">
|
<variable name='lemur_default_state' type='string' description="" mandatory="True">
|
||||||
<value>Bourgogne</value>
|
<value>Bourgogne</value>
|
||||||
</variable>
|
</variable>
|
||||||
<variable name='lemur_default_location' type='' description="" mandatory="True">
|
<variable name='lemur_default_location' type='string' description="" mandatory="True">
|
||||||
<value>Dijon</value>
|
<value>Dijon</value>
|
||||||
</variable>
|
</variable>
|
||||||
<variable name='lemur_default_organization' type='' description="" mandatory="True"/>
|
<variable name='lemur_default_organization' type='string' description="" mandatory="True"/>
|
||||||
<variable name='lemur_default_organization_unit' type='' description="" mandatory="True"/>
|
<variable name='lemur_default_organization_unit' type='string' description="" mandatory="True"/>
|
||||||
</family>
|
</family>
|
||||||
</variables>
|
</variables>
|
||||||
<constraints>
|
<constraints>
|
||||||
|
|
|
@ -3,7 +3,7 @@ Description=Lemur
|
||||||
After=postgresql.service
|
After=postgresql.service
|
||||||
|
|
||||||
[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
|
User=lemur
|
||||||
Group=lemur
|
Group=lemur
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue