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

lemur_cron.service

@@ -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

lemur_cron.timer

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

tmpl/lemur.conf.py

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

tmpl/lemur.yml

@@ -16,3 +16,7 @@ sqlscripts:
   - /usr/share/eole/db/lemur/gen/lemur.sql
 pwd_files:
   - {'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