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

add pki informations
2020-11-14 08:16:13 +01:00 · 2020-11-14 08:16:08 +01:00 · 2020-10-20 22:37:03 +02:00 · 2020-10-20 22:36:54 +02:00
2 changed files with 5 additions and 0 deletions
--- a/risotto.service
+++ b/risotto.service
@ -1,5 +1,6 @@
 [Unit]
 Description=risotto
+After=postgresql.service

 [Service]
 ExecStart=/usr/bin/risotto-server
--- a/tmpl/risotto.conf
+++ b/tmpl/risotto.conf
@ -26,3 +26,7 @@ PASSWORD_ADMIN_PASSWORD="%%password_admin_password"
 PASSWORD_DEVICE_IDENTIFIER="%%password_device_identifier"
 PASSWORD_URL="https://%%nom_domaine_machine:8001/"
 %end if
+%if %%getVar('lemur_db_name', None)
+PKI_ADMIN_PASSWORD="%%lemur_admin_password"
+PKI_ADMIN_EMAIL="%%lemur_admin_email"
+%end if
Author	SHA1	Message	Date
Emmanuel Garette	aee885250c	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-11-14 08:16:13 +01:00
Emmanuel Garette	d7d406ffcc	add pki informations	2020-11-14 08:16:08 +01:00
Emmanuel Garette	97980afed9	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-10-20 22:37:03 +02:00
Emmanuel Garette	b0e81c15f7	start risotto after postgres	2020-10-20 22:36:54 +02:00