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

db/lemur.sql

@@ -0,0 +1 @@
+CREATE EXTENSION pg_trgm;

dicos/50_lemur.xml

@@ -17,11 +17,13 @@
             <variable name='lemur_db_user' type='string' description="Nom de l'utilisateur de la base de donnée de Lemur" mode="expert">
                 <value>lemur</value>
             </variable>
+            <variable name='lemur_admin_password' type='password' description="Mot de passe de l'utilisateur admin de Lemur" auto_save="True"/>
         </family>
     </variables>
     <constraints>
         <fill name='gen_random_base64' target='lemur_secret'/>
         <fill name='gen_random_base64' target='lemur_token_secret'/>
         <fill name='gen_random_base64' target='lemur_encrypt_keys'/>
+        <fill name='gen_random' target='lemur_admin_password'/>
     </constraints>
 </creole>

gulp/build.js

@@ -237,7 +237,7 @@ gulp.task('addUrlContextPath',['addUrlContextPath:revreplace'], function(){
   .forEach(function(file){
     return gulp.src(file)
       .pipe(gulpif(urlContextPathExists, replace('api/', argv.urlContextPath + '/api/')))
-      .pipe(gulpif(urlContextPathExists, replace('angular/', argv.urlContextPath + '/angular/')))
+      .pipe(gulpif(urlContextPathExists, replace('/angular/', '/' + argv.urlContextPath + '/angular/')))
       .pipe(gulp.dest(function(file){
         return file.base;
       }))
@@ -256,10 +256,9 @@ gulp.task('addUrlContextPath:revreplace', ['addUrlContextPath:revision'], functi
   var manifest = gulp.src("lemur/static/dist/rev-manifest.json");
   var urlContextPathExists = argv.urlContextPath ? true : false;
   return gulp.src( "lemur/static/dist/index.html")
-    .pipe(gulpif(urlContextPathExists, revReplace({prefix: argv.urlContextPath + '/', manifest: manifest}, revReplace({manifest: manifest}))))
     .pipe(gulp.dest('lemur/static/dist'));
 })
 
 
 gulp.task('build', ['build:ngviews', 'build:inject', 'build:images', 'build:fonts', 'build:html', 'build:extras']);
-gulp.task('package', ['addUrlContextPath', 'package:strip']);
+gulp.task('package', ['addUrlContextPath', 'package:strip']);

lemur.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=Lemur
+After=postgresql.service
+
+[Service]
+ExecStart=/usr/bin/lemur start -b 127.0.0.1:8002 -c /etc/lemur/lemur.conf.py
+User=lemur
+Group=lemur
+
+[Install]
+WantedBy=multi-user.target
+

posttemplate/03-lemur

@@ -5,4 +5,13 @@ 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
 
+cd /usr/share/lemur/
+systemctl start postgresql.service
+lemur --config=/etc/lemur/lemur.conf.py init --password $(CreoleGet lemur_admin_password)
+systemctl stop postgresql.service
+rm -f *.log
+
+mkdir -p /var/log/lemur/
+chown lemur: /var/log/lemur/
+
 exit 0

tmpl/lemur.conf.py

@@ -44,14 +44,14 @@ METRIC_PROVIDERS = []
 # Logging
 
 LOG_LEVEL = "DEBUG"
-LOG_FILE = "lemur.log"
+LOG_FILE = "/var/log/lemur/lemur.log"
 
 
 # Database
 
 # modify this if you are not using a local database
 SQLALCHEMY_DATABASE_PASSWORD = 'replaceme'
-SQLALCHEMY_DATABASE_URI = f'postgresql://%%lemur_db_user:{SQLALCHEMY_DATABASE_PASSWORD}@localhost:5432/%%lemur_db_name'
+SQLALCHEMY_DATABASE_URI = f'postgresql:///%%lemur_db_name?host=/var/run/postgresql&user=%%lemur_db_user&password={SQLALCHEMY_DATABASE_PASSWORD}'
 
 # AWS
 

tmpl/lemur.yml

@@ -12,5 +12,7 @@ dbport: 5432
 dbtype: postgres
 dbname: %%dbname
 template: 'template0'
+sqlscripts:
+  - /usr/share/eole/db/lemur/gen/lemur.sql
 pwd_files:
-  - {'file': '/etc/lemur/lemur.conf.py', 'pattern': 'SQLALCHEMY_DATABASE_PASSWORD = "'}
+  - {'file': '/etc/lemur/lemur.conf.py', 'pattern': "SQLALCHEMY_DATABASE_PASSWORD = '"}