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

debian/compat

@@ -0,0 +1 @@
+11

debian/control

@@ -0,0 +1,113 @@
+Source: lemur
+Section: admin
+Priority: extra
+Maintainer: Cadoles <contact@cadoles.com>
+Build-depends: debhelper (>=11),
+	python3-all,
+	python3-setuptools,
+	dh-python,
+	npm
+Standards-Version: 3.9.4
+Homepage: https://forge.cadoles.com/Infra/lemur
+
+Package: eole-lemur
+Architecture: any
+Depends: ${misc:Depends},
+	lemur,
+	lemur-static,
+	eole-postgresql,
+# for PIP
+	python3-pip,
+	gcc,
+	python3-dev
+Description: Lemur - eolisation
+
+Package: lemur
+Architecture: any
+Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
+Depends: ${python:Depends}, ${misc:Depends},
+	python3-lemur
+Description: Lemur
+
+Package: python3-lemur
+Architecture: any
+Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
+Depends: python3-acme,
+	python3-alembic,
+	python3-amqp,
+	python3-aniso8601,
+	python3-arrow,
+	python3-bcrypt,
+	python3-bs4,
+	python3-billiard,
+	python3-blinker,
+	python3-boto3,
+	python3-botocore,
+	python3-celery,
+	python3-certifi,
+	python3-cffi,
+	python3-chardet,
+	python3-click,
+	python3-cloudflare,
+	python3-dnspython,
+	python3-flask-bcrypt,
+	python3-flask-cors,
+	python3-flask-mail,
+	python3-flask-migrate,
+	python3-flask-principal,
+	python3-flask-restful,
+	python3-flask-script,
+	python3-flask-sqlalchemy,
+	python3-flask,
+	python3-future,
+	python3-gunicorn,
+	python3-hvac,
+	python3-idna,
+	python3-inflection,
+	python3-itsdangerous,
+	python3-jinja2,
+	python3-jmespath,
+	python3-josepy,
+	python3-kombu,
+	python3-lockfile,
+	python3-mako,
+	python3-markupsafe,
+	python3-marshmallow-sqlalchemy,
+	python3-ndg-httpsclient,
+	python3-paramiko,
+	python3-pem,
+	python3-psycopg2,
+	python3-pyasn1-modules,
+	python3-pyasn1,
+	python3-pycparser,
+	python3-jwt,
+	python3-nacl,
+	python3-openssl,
+	python3-rfc3339,
+	python3-dateutil,
+	python3-editor,
+	python3-pythonjsonlogger,
+	python3-ldap,
+	python3-tz,
+	python3-yaml,
+	python3-redis,
+	python3-requests-toolbelt,
+	python3-requests,
+	python3-retrying,
+	python3-s3transfer,
+	python3-six,
+	python3-soupsieve,
+	python3-sqlalchemy-utils,
+	python3-sqlalchemy,
+	python3-tabulate,
+	python3-urllib3,
+	python3-vine,
+	python3-werkzeug,
+	python3-xmltodict
+Description: Lemur - library part
+
+Package: lemur-static
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}
+Description: static HTML/JS/CSS file

debian/copyright

@@ -0,0 +1,10 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: lemur
+Upstream-Contact: Cadoles <contact@cadoles.com>
+Source: https://forge.cadoles.com/Infra/lemur
+
+Files: *
+Copyright: Lemur
+License: Apache-2.0 License 
+
+License: Apache-2.0 License 

debian/eole-lemur.install

@@ -0,0 +1,4 @@
+dicos usr/share/eole/creole/
+tmpl/* usr/share/eole/creole/distrib/
+posttemplate/* usr/share/eole/posttemplate/
+funcs/* usr/share/creole/funcs

debian/lemur-static.install

@@ -0,0 +1 @@
+lemur/static/dist/* usr/share/lemur/static/

debian/rules

@@ -0,0 +1,28 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#DH_VERBOSE = 1
+
+export PYBUILD_NAME = lemur
+export PYBUILD_DISABLE_python3 = test
+
+%:
+	# suppression requirements version of package
+	# only last version are supported by lemur
+	# but Ubuntu has not last version
+	sed -i "s/==\(\([[:digit:]]\)*\(\.\)*\)*//g" requirements.txt
+	dh $@ --with python3 --buildsystem=pybuild
+
+override_dh_install:
+	rm -rf debian/python3-lemur/usr/lib/python*/dist-packages/lemur/static/
+	rm -rf debian/python3-lemur/usr/lib/python*/dist-packages/lemur/tests/
+	rm -rf debian/python3-lemur/usr/lib/python*/dist-packages/trustores
+	mkdir -p debian/lemur/usr
+	mv debian/python3-lemur/usr/bin debian/lemur/usr
+	dh_install
+
+override_dh_auto_build:
+	npm install --unsafe-perm
+	node_modules/.bin/gulp build
+	node_modules/.bin/gulp package --urlContextPath=lemur
+	dh_auto_build

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

dicos/50_lemur.xml

@@ -4,7 +4,7 @@
         <!--service>lemur</service-->
 	<file name='/etc/lemur/lemur.conf.py' mkdir='True'/>
 	<file name='/etc/eole/eole-db.d/lemur.yml'/>
-	<file name='/etc/nginx/sites-enabled/lemur' source='nginx-lemur'/>
+	<file name='/etc/nginx/web.d/lemur.conf' source='nginx-lemur.conf'/>
     </files>
     <variables>
         <family name='lemur'>

funcs/lemur.py

@@ -1,5 +1,6 @@
 from secrets import token_bytes as _token_bytes
 from base64 import urlsafe_b64encode as _urlsafe_b64encode
 
+
 def gen_random_base64():
-    return base64.urlsafe_b64encode(secrets.token_bytes(32)).decode()
+    return _urlsafe_b64encode(_token_bytes(32)).decode()

tmpl/lemur.yml

@@ -1,5 +1,4 @@
-%from os import listdir
-%set %%dbname = %lemur_db_name
+%set %%dbname = %%lemur_db_name
 ---
 dbuser: %%lemur_db_user
 dbuser_options:

tmpl/nginx-lemur

@@ -1,20 +0,0 @@
-server {
-	listen 80 default_server;
-	listen [::]:80 default_server;
-
-	location /lemur/api {
-	     proxy_pass  http://127.0.0.1:8002/api;
-	     proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
-	     proxy_redirect off;
-	     proxy_buffering off;
-	     proxy_set_header        Host            $host;
-	     proxy_set_header        X-Real-IP       $remote_addr;
-	     proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-	 }
-
-	 location /lemur {
-	     root /usr/share/lemur/static;
-	     include mime.types;
-	     index index.html;
-	 }
-}

tmpl/nginx-lemur.conf

@@ -0,0 +1,15 @@
+location /lemur/api {
+    proxy_pass  http://127.0.0.1:8002/api;
+    proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
+    proxy_redirect off;
+    proxy_buffering off;
+    proxy_set_header        Host            $host;
+    proxy_set_header        X-Real-IP       $remote_addr;
+    proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+}
+
+location /lemur/ {
+    alias /usr/share/lemur/static/;
+    include mime.types;
+    index index.html;
+}