Merge pull request #23 from NethServer/users

User management
NethServer · Dec 11, 2023 · 61b97a7 · 61b97a7
2 parents 6501362 + 04b1fa1
commit 61b97a7
Show file tree

Hide file tree

Showing 6 changed files with 1,347 additions and 166 deletions.
diff --git a/builder/build.sh b/builder/build.sh
@@ -49,7 +49,7 @@ buildah run ${container} /bin/bash -c "apt-get -y install --no-install-recommend
     apt-get clean"
 
 echo "Install packages with pip"
-buildah run ${container} /bin/bash -c "pip install pytest==7.1.2 pyuci pytest-mock"
+buildah run ${container} /bin/bash -c "pip install pytest==7.1.2 pyuci pytest-mock passlib"
 
 echo "Setup image"
 buildah config --workingdir /root ${container}

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
     url = "https://github.com/NethServer/python3-nethsec",
     license = "GPLv3",
     package_dir = {'': 'src'},
-    packages = ['nethsec', 'nethsec.utils', 'nethsec.firewall', 'nethsec.mwan', 'nethsec.dpi', 'nethsec.ipsec', 'nethsec.ovpn'],
+    packages = ['nethsec', 'nethsec.utils', 'nethsec.firewall', 'nethsec.mwan', 'nethsec.dpi', 'nethsec.ipsec', 'nethsec.ovpn', 'nethsec.users'],
     requires = [ "pyuci" ],
     classifiers = [
         "Programming Language :: Python :: 3",