Merge pull request #588 from LibrIT/debian11

Debian11
LibrIT · Sep 11, 2022 · 8beac20 · 8beac20
2 parents 9c18f57 + 1f31ea6
commit 8beac20
Show file tree

Hide file tree

Showing 59 changed files with 371 additions and 2,002 deletions.
diff --git a/Dockerfile b/Dockerfile
diff --git a/Dockerfile-Debian9 b/Dockerfile-Debian9
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Goals:
  * Provide a connexions history
  * Provide command and actions history (by users)
 
- Test the 5 minutes Debian installation :
+ Test the 5 minutes Debian 11 installation :
  ```
- bash <(curl -s https://raw.githubusercontent.com/librit/passhport/master/tools/passhport-install-script-debian.sh)
+ bash <(curl -s https://raw.githubusercontent.com/librit/passhport/master/tools/install/install_debian_11.sh)
  ```
diff --git a/passhportd/app/__init__.py b/passhportd/app/__init__.py
@@ -1,9 +1,4 @@
 # -*-coding:Utf-8 -*-
-
-# Compatibility 2.7-3.4
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
 from flask_migrate import Migrate

diff --git a/passhportd/app/models.py b/passhportd/app/models.py
@@ -1,9 +1,4 @@
 # -*-coding:Utf-8 -*-
-
-# Compatibility 2.7-3.4
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from app import db
 from .models_mod import (user, target, usergroup, targetgroup, logentry,
                         exttargetaccess, passentry)

diff --git a/passhportd/app/models_mod/logentry.py b/passhportd/app/models_mod/logentry.py
@@ -1,9 +1,4 @@
 # -*-coding:Utf-8 -*-
-
-# Compatibility 2.7-3.4
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from app import app, db
 from app.models_mod import target,usergroup,targetgroup,user
 

diff --git a/passhportd/app/models_mod/targetgroup.py b/passhportd/app/models_mod/targetgroup.py
@@ -1,9 +1,4 @@
 # -*-coding:Utf-8 -*-
-
-# Compatibility 2.7-3.4
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from app import db, models_mod
 
 # Table to handle the self-referencing many-to-many relationship

diff --git a/passhportd/app/models_mod/usergroup.py b/passhportd/app/models_mod/usergroup.py
@@ -1,9 +1,4 @@
 # -*-coding:Utf-8 -*-
-
-# Compatibility 2.7-3.4
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from app import db, models_mod
 from app.models_mod import target,targetgroup
 

diff --git a/passhportd/app/tests/test_models_mod/test_target.py b/passhportd/app/tests/test_models_mod/test_target.py
@@ -1,9 +1,4 @@
 # -*-coding:Utf-8 -*-
-
-# Compatibility 2.7-3.4
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import os
 
 from nose.tools import *

diff --git a/passhportd/app/tests/test_models_mod/test_user.py b/passhportd/app/tests/test_models_mod/test_user.py
@@ -1,9 +1,4 @@
 # -*-coding:Utf-8 -*-
-
-# Compatibility 2.7-3.4
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import os
 
 from nose.tools import *

diff --git a/passhportd/app/views_mod/__init__.py b/passhportd/app/views_mod/__init__.py
@@ -1,9 +1,5 @@
 # -*-coding:Utf-8 -*-
 
-# Compatibility 2.7-3.4
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import flask
 from app import app
 

diff --git a/passhportd/app/views_mod/targetgroup/targetgroup.py b/passhportd/app/views_mod/targetgroup/targetgroup.py
@@ -1,9 +1,4 @@
 # -*-coding:Utf-8 -*-
-
-# Compatibility 2.7-3.4
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from flask import request
 from sqlalchemy import exc
 from sqlalchemy.orm import sessionmaker

diff --git a/passhportd/app/views_mod/usergroup/usergroup.py b/passhportd/app/views_mod/usergroup/usergroup.py
@@ -1,9 +1,4 @@
 # -*-coding:Utf-8 -*-
-
-# Compatibility 2.7-3.4
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from flask import request
 from sqlalchemy import exc
 from sqlalchemy.orm import sessionmaker

diff --git a/passhportd/db_create.py b/passhportd/db_create.py
@@ -1,10 +1,5 @@
 #!/usr/bin/env python
 # -*-coding:Utf-8 -*-
-
-# Compatibility 2.7-3.4
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from migrate.versioning import api
 from config import SQLALCHEMY_DATABASE_URI
 from config import SQLALCHEMY_MIGRATE_REPO

diff --git a/passhportd/passhportd b/passhportd/passhportd
@@ -1,10 +1,5 @@
 #!/home/passhport/passhport-run-env/bin/python
 # -*-coding:Utf-8 -*-
-
-# Compatibility 2.7-3.4
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import os,ssl
 from config import SQLALCHEMY_DATABASE_DIR
 from config import SSL_CERTIFICAT

diff --git a/passhportd/upgrade-db.py b/passhportd/upgrade-db.py
@@ -1,10 +1,5 @@
 #!/usr/bin/env python
 # -*-coding:Utf-8 -*-
-
-# Compatibility 2.7-3.4
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from config import SQLALCHEMY_DATABASE_DIR
 
 """Server side using flask"""

diff --git a/requirements.txt b/requirements.txt
@@ -1,16 +1,42 @@
-Flask_Migrate==2.5.2
-itsdangerous==1.1.0
-alembic==1.1.0
-SQLAlchemy==1.3.7
-cryptography==3.3.2
-tabulate==0.8.3
-Flask==1.0.4
-requests==2.21.0
-Flask_SQLAlchemy==2.4.0
-psutil==5.6.7
-ldap3==2.6
-sqlalchemy_migrate==0.12.0
+wheel
+alembic==1.8.1
+certifi==2022.6.15.1
+cffi==1.15.1
+chardet==5.0.0
+charset-normalizer==2.1.1
+click==8.1.3
+cryptography==38.0.1
+decorator==5.1.1
 docopt==0.6.2
-sshpubkeys==3.1.0
-Jinja2==3.0.3
-Werkzeug==2.0.3
+ecdsa==0.18.0
+Flask==2.2.2
+Flask-Migrate==3.1.0
+Flask-SQLAlchemy==2.5.1
+greenlet==1.1.3
+idna==3.3
+importlib-metadata==4.12.0
+itsdangerous==2.1.2
+Jinja2==3.1.2
+ldap3==2.9.1
+Mako==1.2.2
+MarkupSafe==2.1.1
+pbr==5.10.0
+pkg_resources==0.0.0
+psutil==5.9.2
+psycopg2==2.9.3
+psycopg2-binary==2.9.3
+pyasn1==0.4.8
+pycparser==2.21
+python-dateutil==2.8.2
+python-editor==1.0.4
+requests==2.28.1
+six==1.16.0
+SQLAlchemy==1.4.41
+sqlalchemy-migrate==0.13.0
+sqlparse==0.4.2
+sshpubkeys==3.3.1
+tabulate==0.8.10
+Tempita==0.5.2
+urllib3==1.26.12
+Werkzeug==2.2.2
+zipp==3.8.1
diff --git a/tools/garbage-collector.sh → tools/bin/garbage-collector.sh b/tools/garbage-collector.sh → tools/bin/garbage-collector.sh
diff --git a/tools/passhport-admin.sh → tools/bin/passhport-admin.sh b/tools/passhport-admin.sh → tools/bin/passhport-admin.sh
diff --git a/tools/bin/passhportd.wsgi b/tools/bin/passhportd.wsgi
@@ -0,0 +1,4 @@
+import sys
+sys.path.insert(0, '/home/passhport/passhport/passhportd')
+
+from app import app as application
diff --git a/tools/passhweb.wsgi → tools/bin/passhweb.wsgi b/tools/passhweb.wsgi → tools/bin/passhweb.wsgi
@@ -1,7 +1,3 @@
-activate_this = '/home/passhport/passhport-run-env/bin/activate_this.py'
-with open(activate_this) as file_:
-    exec(file_.read(), dict(__file__=activate_this))
-
 import sys
 sys.path.insert(0, '/home/passhport/passhport/passhweb')
 

diff --git a/tools/postgres-set-seq-id.sh → tools/bin/postgres-set-seq-id.sh b/tools/postgres-set-seq-id.sh → tools/bin/postgres-set-seq-id.sh
diff --git a/tools/save-passhportd-configuration.pl → tools/bin/save-passhportd-configuration.pl b/tools/save-passhportd-configuration.pl → tools/bin/save-passhportd-configuration.pl
diff --git a/tools/send-reports-daily.sh → tools/bin/send-reports-daily.sh b/tools/send-reports-daily.sh → tools/bin/send-reports-daily.sh
diff --git a/tools/send-reports-weekly.sh → tools/bin/send-reports-weekly.sh b/tools/send-reports-weekly.sh → tools/bin/send-reports-weekly.sh
diff --git a/tools/update-passhport.sh → tools/bin/update-passhport.sh b/tools/update-passhport.sh → tools/bin/update-passhport.sh
diff --git a/tools/SELinux-passhport.pp → tools/confs/SELinux-passhport.pp b/tools/SELinux-passhport.pp → tools/confs/SELinux-passhport.pp
diff --git a/tools/SELinux-passhport.te → tools/confs/SELinux-passhport.te b/tools/SELinux-passhport.te → tools/confs/SELinux-passhport.te
diff --git a/tools/openssl-for-passhportd.cnf → tools/confs/openssl-for-passhportd.cnf b/tools/openssl-for-passhportd.cnf → tools/confs/openssl-for-passhportd.cnf
diff --git a/tools/passhport-admin.bash_completion → tools/confs/passhport-admin.bash_completion b/tools/passhport-admin.bash_completion → tools/confs/passhport-admin.bash_completion
diff --git a/tools/crons/garbage-collector.cron b/tools/crons/garbage-collector.cron
@@ -0,0 +1,4 @@
+* * * * * passhport /home/passhport/passhport/tools/bin/garbage-collector.sh > /var/log/passhport/garbage-collector.log
+* * * * * passhport sleep 15 && /home/passhport/passhport/tools/bin/garbage-collector.sh >> /var/log/passhport/garbage-collector.log
+* * * * * passhport sleep 30 && /home/passhport/passhport/tools/bin/garbage-collector.sh >> /var/log/passhport/garbage-collector.log
+* * * * * passhport sleep 45 && /home/passhport/passhport/tools/bin/garbage-collector.sh >> /var/log/passhport/garbage-collector.log
diff --git a/tools/limit_size.cron → tools/crons/limit_size.cron b/tools/limit_size.cron → tools/crons/limit_size.cron
diff --git a/tools/sendreport.cron → tools/crons/sendreport.cron b/tools/sendreport.cron → tools/crons/sendreport.cron
diff --git a/tools/generate-demo.sh → tools/dev-tools/generate-demo.sh b/tools/generate-demo.sh → tools/dev-tools/generate-demo.sh
diff --git a/tools/passhportd.sh → tools/dev-tools/passhportd.sh b/tools/passhportd.sh → tools/dev-tools/passhportd.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# WARNING: this script is made for the default automated installation.
+# WARNING: this script is made for dev purposes.
 
 # Launch the passhportd in the virtualenv
 nohup /home/passhport/passhport-run-env/bin/python /home/passhport/passhport/passhportd/passhportd >> /var/log/passhport/passhportd 2>&1 &

diff --git a/tools/docker/docker_switch.sh b/tools/docker/docker_switch.sh
diff --git a/tools/garbage-collector.cron b/tools/garbage-collector.cron
diff --git a/tools/install-tools/WSIG_debian_10_installation_and_configuration.sh b/tools/install-tools/WSIG_debian_10_installation_and_configuration.sh