Compare commits

..

No commits in common. "fc97ee1c63d3ee97863695564273bf92a180e099" and "996c15165a3e62cc256f0be444c3f36781507d33" have entirely different histories.

3 changed files with 11 additions and 30 deletions

View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<creole> <creole>
<files> <files>
<service>lemur</service> <!--service>lemur</service-->
<file name='/etc/lemur/lemur.conf.py' mkdir='True'/> <file name='/etc/lemur/lemur.conf.py' mkdir='True'/>
<file name='/etc/eole/eole-db.d/lemur.yml'/> <file name='/etc/eole/eole-db.d/lemur.yml'/>
<file name='/etc/nginx/web.d/lemur.conf' source='nginx-lemur.conf'/> <file name='/etc/nginx/web.d/lemur.conf' source='nginx-lemur.conf'/>
</files> </files>
<variables> <variables>
<family name='lemur'> <family name='lemur'>
@ -18,18 +18,6 @@
<value>lemur</value> <value>lemur</value>
</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_default_country' type='' description="" mandatory="True">
<value>FR</value>
</variable>
<variable name='lemur_default_state' type='' description="" mandatory="True">
<value>Bourgogne</value>
</variable>
<variable name='lemur_default_location' type='' 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"/>
</family> </family>
</variables> </variables>
<constraints> <constraints>

View File

@ -12,10 +12,8 @@ chown lemur: /var/log/lemur/
chmod 640 /etc/lemur/* chmod 640 /etc/lemur/*
chgrp lemur /etc/lemur/* chgrp lemur /etc/lemur/*
systemctl start postgresql.service systemctl start postgresql.service
psql -Upostgres -c "grant all on all tables in schema public to lemur" lemur
psql -Upostgres -c "grant all on all sequences in schema public to lemur" lemur
psql -Upostgres -c "grant all on all functions in schema public to lemur" lemur
su - lemur -s /bin/bash -c "lemur --config=/etc/lemur/lemur.conf.py init --password $(CreoleGet lemur_admin_password)" su - lemur -s /bin/bash -c "lemur --config=/etc/lemur/lemur.conf.py init --password $(CreoleGet lemur_admin_password)"
systemctl stop postgresql.service systemctl stop postgresql.service
rm -f *.log
exit 0 exit 0

View File

@ -24,20 +24,16 @@ LEMUR_ALLOWED_DOMAINS = []
# Mail Server # Mail Server
LEMUR_EMAIL = '%%lemur_admin_email' LEMUR_EMAIL = ''
LEMUR_SECURITY_TEAM_EMAIL = [] LEMUR_SECURITY_TEAM_EMAIL = []
# Certificate Defaults # Certificate Defaults
LEMUR_DEFAULT_COUNTRY = '%%lemur_default_country' LEMUR_DEFAULT_COUNTRY = ''
LEMUR_DEFAULT_STATE = '%%lemur_default_state' LEMUR_DEFAULT_STATE = ''
LEMUR_DEFAULT_LOCATION = '%%lemur_default_location' LEMUR_DEFAULT_LOCATION = ''
LEMUR_DEFAULT_ORGANIZATION = '%%lemur_default_organization' LEMUR_DEFAULT_ORGANIZATION = ''
LEMUR_DEFAULT_ORGANIZATIONAL_UNIT = '%%lemur_default_organization_unit' LEMUR_DEFAULT_ORGANIZATIONAL_UNIT = ''
# Default issuer
LEMUR_DEFAULT_ISSUER_PLUGIN = 'cryptography-issuer'
# Authentication Providers # Authentication Providers
ACTIVE_PROVIDERS = [] ACTIVE_PROVIDERS = []
@ -49,7 +45,6 @@ METRIC_PROVIDERS = []
LOG_LEVEL = "DEBUG" LOG_LEVEL = "DEBUG"
LOG_FILE = "/var/log/lemur/lemur.log" LOG_FILE = "/var/log/lemur/lemur.log"
LOG_UPGRADE_FILE = '/var/log/lemur/db_upgrade.log'
# Database # Database