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

regen certificate in lemur
2021-08-28 07:37:42 +02:00 · 2021-08-28 07:37:37 +02:00 · 2021-05-22 18:25:49 +02:00 · 2021-05-22 18:25:41 +02:00 · 2021-05-22 18:24:51 +02:00
3 changed files with 4 additions and 2 deletions
--- a/debian/eole-lemur.install
+++ b/debian/eole-lemur.install
@ -3,5 +3,5 @@ tmpl/* usr/share/eole/creole/distrib/
 posttemplate/* usr/share/eole/posttemplate/
 funcs/* usr/share/creole/funcs
 db/* usr/share/eole/db/lemur/gen/
-timer/* lib/systemd/system
+lemur_cron.timer lib/systemd/system
 lemur_cron.service lib/systemd/system
--- a/lemur_cron.service
+++ b/lemur_cron.service
@ -4,7 +4,7 @@ After=lemur.service

 [Service]
 Environment="LEMUR_CONF=/etc/lemur/lemur.conf.py"
-ExecStart=/usr/bin/lemur certificate reissue
+ExecStart=/usr/bin/lemur certificate reissue --commit
 User=lemur
 Group=lemur

--- a/posttemplate/03-lemur
+++ b/posttemplate/03-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
Author	SHA1	Message	Date
Emmanuel Garette	430cef51e6	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2021-08-28 07:37:42 +02:00
Emmanuel Garette	99bd9b4fb5	regen certificate in lemur	2021-08-28 07:37:37 +02:00
Emmanuel Garette	3bdd357782	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2021-05-22 18:25:49 +02:00
Emmanuel Garette	e086e08d9a	fix	2021-05-22 18:25:41 +02:00
Emmanuel Garette	6b0e72ac5b	fix	2021-05-22 18:24:51 +02:00