Merge "Drop Travis CI support"
diff --git a/_modules/oscap/__init__.py b/_modules/oscap/__init__.py
index f20d11e..126cdf8 100644
--- a/_modules/oscap/__init__.py
+++ b/_modules/oscap/__init__.py
@@ -100,7 +100,7 @@
if not os.path.isdir(base_dir):
os.makedirs(base_dir)
os.chmod(base_dir, mode)
- os.rename(temp_dir, results_dir)
+ shutil.move(temp_dir, results_dir)
os.chmod(results_dir, mode)
if stderr:
diff --git a/debian/control b/debian/control
index c773ba6..09368c1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,11 @@
Source: salt-formula-openscap
-Maintainer: MOS Linux Team <mos-linux@mirantis.com>
+Maintainer: Mirantis Dev <dev@mirantis.com>
Section: admin
Priority: optional
Build-Depends: python, python-yaml, debhelper (>= 9)
Standards-Version: 3.9.6
-Vcs-Browser: https://github.com/salt-formulas/salt-formula-openscap
-Vcs-Git: https://github.com/salt-formulas/salt-formula-openscap.git
+Vcs-Browser: https://gerrit.mcp.mirantis.com/#/admin/projects/salt-formulas/openscap
+Vcs-Git: https://gerrit.mcp.mirantis.com/salt-formulas/openscap.git
Package: salt-formula-openscap
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 77e364f..ec66ed3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: salt-formula-openscap
-Source: https://github.com/salt-formulas/salt-formula-openscap
+Source: https://gerrit.mcp.mirantis.com/salt-formulas/openscap
Files: *
Copyright: 2017, MOS Linux Team <mos-linux@mirantis.com>
diff --git a/metadata.yml b/metadata.yml
index 7faf41e..aa07c47 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,4 +1,3 @@
name: "openscap"
version: "0.1"
-source: "https://github.com/salt-formulas/salt-formula-openscap"
-
+source: "https://gerrit.mcp.mirantis.com/salt-formulas/openscap"
diff --git a/openscap/map.jinja b/openscap/map.jinja
index a797bff..cf70c67 100644
--- a/openscap/map.jinja
+++ b/openscap/map.jinja
@@ -2,7 +2,8 @@
'Debian': {
'packages': ['libopenscap8',
'xccdf-benchmarks-mirantis',
- 'python-lxml',],
+ 'python-lxml',
+ 'xz-utils',],
},
'RedHat': {
'packages': ['openscap',