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

This commit is contained in:
Emmanuel Garette 2021-05-22 16:38:53 +02:00
commit c6c4526989
4 changed files with 26 additions and 0 deletions

12
lemur_cron.service Normal file
View File

@ -0,0 +1,12 @@
[Unit]
Description=Lemur
After=lemur.service
[Service]
Environment="LEMUR_CONF=/etc/lemur/lemur.conf.py"
ExecStart=/usr/bin/lemur certificate reissue
User=lemur
Group=lemur
[Install]
WantedBy=basic.target

9
lemur_cron.timer Normal file
View File

@ -0,0 +1,9 @@
[Unit]
Description=Crontab for Lemur
[Timer]
OnCalendar=daily
Unit=lemur_cron.service
[Install]
WantedBy=timers.target

View File

@ -26,6 +26,7 @@ LEMUR_ALLOWED_DOMAINS = []
LEMUR_EMAIL = '%%lemur_admin_email' LEMUR_EMAIL = '%%lemur_admin_email'
LEMUR_SECURITY_TEAM_EMAIL = [] LEMUR_SECURITY_TEAM_EMAIL = []
LEMUR_EMAIL_SENDER = 'smtp'
# Certificate Defaults # Certificate Defaults

View File

@ -16,3 +16,7 @@ sqlscripts:
- /usr/share/eole/db/lemur/gen/lemur.sql - /usr/share/eole/db/lemur/gen/lemur.sql
pwd_files: pwd_files:
- {'file': '/etc/lemur/lemur.conf.py', 'pattern': "SQLALCHEMY_DATABASE_PASSWORD = '"} - {'file': '/etc/lemur/lemur.conf.py', 'pattern': "SQLALCHEMY_DATABASE_PASSWORD = '"}
%set %%var = %%getVar('risotto_main_dbname', None)
%if not %%is_empty(%%var)
- {'file': '/etc/risotto/risotto.conf', 'pattern': "LEMUR_DB_PASSWORD='"}
%end if