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

debian/eole-lemur.install

@@ -2,4 +2,6 @@ dicos usr/share/eole/creole/
 tmpl/* usr/share/eole/creole/distrib/
 posttemplate/* usr/share/eole/posttemplate/
 funcs/* usr/share/creole/funcs
-db/* /usr/share/eole/db/lemur/gen/
+db/* usr/share/eole/db/lemur/gen/
+lemur_cron.timer lib/systemd/system
+lemur_cron.service lib/systemd/system

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 --commit
+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

posttemplate/03-lemur

@@ -3,7 +3,7 @@
 set -e
 
 # install unrelease python modules
-pip3 install alembic-autogenerate-enums==0.0.2 asyncpool==1.0 certsrv==2.1.1 cryptography==3.1.1 dnspython3==1.15.0 dyn==1.8.1 flask-replicated==1.4 javaobj-py3==0.4.0.1 jsonlines==1.2.0 logmatic-python==0.1.7 marshmallow==2.20.4 pycryptodomex==3.9.7 pyjks==20.0.0 raven[flask]==6.10.0 twofish==0.3.0
+pip3 install alembic-autogenerate-enums==0.0.2 asyncpool==1.0 certsrv==2.1.1 cryptography==3.1.1 dnspython3==1.15.0 dyn==1.8.1 flask-replicated==1.4 javaobj-py3==0.4.0.1 jsonlines==1.2.0 logmatic-python==0.1.7 marshmallow==2.20.4 pycryptodomex==3.9.7 pyjks==20.0.0 raven[flask]==6.10.0 twofish==0.3.0 pyjwt==2.1.0
 
 mkdir -p /var/log/lemur/
 chown lemur: /var/log/lemur/
@@ -18,4 +18,6 @@ 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)"
 systemctl stop postgresql.service
 
+systemctl enable --now lemur_cron.timer
+
 exit 0

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