ArielGlenn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/233478
Change subject: retention: split setup.py into two files, for clients and master
......................................................................
retention: split setup.py into two files, for clients and master
master needs config samples and scripts, as well as the lib package
the clients need just the lib
make extra clear that configs also go on the minions
Change-Id: I1dfe3b85a6ae763b4a1cc46643037ec4eeff95b1
---
A clouseau/clouseau-master/__init__.py
M clouseau/docs/retention/CONFIG.txt
M clouseau/setup.py
A clouseau/setup_lib.py
4 files changed, 39 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software
refs/changes/78/233478/1
diff --git a/clouseau/clouseau-master/__init__.py
b/clouseau/clouseau-master/__init__.py
new file mode 100644
index 0000000..3157aa2
--- /dev/null
+++ b/clouseau/clouseau-master/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+'''
+empty package with only data files and scripts that should
+be placed on the clouseau saltmaster host
+'''
diff --git a/clouseau/docs/retention/CONFIG.txt
b/clouseau/docs/retention/CONFIG.txt
index 716e263..58f6b45 100644
--- a/clouseau/docs/retention/CONFIG.txt
+++ b/clouseau/docs/retention/CONFIG.txt
@@ -10,7 +10,7 @@
These should be in yaml format and stored in the config directory,
/srv/audits/retention/configs by default, on the salt master
-and all minions.
+AND ALL MINIONS.
In addition it maintains an sqlite db for storing the status rules
for files and directories for each host, by default located
diff --git a/clouseau/setup.py b/clouseau/setup.py
index bd3bc21..3ca2e4b 100644
--- a/clouseau/setup.py
+++ b/clouseau/setup.py
@@ -2,13 +2,6 @@
from setuptools import setup
import glob
-def read(files):
- content = ''
- for filename in files:
- content = content + "\n" + open(
- os.path.join(os.path.dirname(__file__), filename)).read()
- return content
-
def get_files(path, extension=None):
if extension is None:
return glob.glob(path + '*')
@@ -16,20 +9,20 @@
return glob.glob(path + '*.' + extension)
setup(
- name="clouseau",
+ name="clouseau-master",
version="0.0.1",
author="Ariel T. Glenn",
author_email="[email protected]",
description=("Auditing scripts and libraries"),
license="GPLv2",
url="http://git.wikimedia.org/something/retention";,
- packages=['clouseau', 'clouseau.retention', 'clouseau.retention.local',
- 'clouseau.retention.remote', 'clouseau.retention.utils',
'tests'],
+ packages=['clouseau-master'],
data_files=[('/srv/audits/retention/scripts',
get_files('scripts/retention/wmf/','sh')),
('/srv/audits/retention/scripts',
get_files('scripts/retention/', 'py')),
('/srv/audits/retention/configs',
get_files('docs/retention/')),
('/srv/salt/_modules', get_files('salt/retention/','py'))],
- long_description=read(['README.txt', 'README_retention.txt']),
+
+ long_description=("Auditing scripts and other files to be installed only
on salt master"),
classifiers=[
"Development Status :: 3 - Alpha",
"Topic :: Utilities",
diff --git a/clouseau/setup_lib.py b/clouseau/setup_lib.py
new file mode 100644
index 0000000..a91ca65
--- /dev/null
+++ b/clouseau/setup_lib.py
@@ -0,0 +1,29 @@
+import os
+from setuptools import setup
+import glob
+
+def read(files):
+ content = ''
+ for filename in files:
+ content = content + "\n" + open(
+ os.path.join(os.path.dirname(__file__), filename)).read()
+ return content
+
+setup(
+ name="clouseau",
+ version="0.0.1",
+ author="Ariel T. Glenn",
+ author_email="[email protected]",
+ description=("Auditing libraries"),
+ license="GPLv2",
+ url="http://git.wikimedia.org/something/retention";,
+ packages=['clouseau', 'clouseau.retention', 'clouseau.retention.local',
+ 'clouseau.retention.remote', 'clouseau.retention.utils',
'tests'],
+
+ long_description=read(['README.txt', 'README_retention.txt']),
+ classifiers=[
+ "Development Status :: 3 - Alpha",
+ "Topic :: Utilities",
+ "License :: OSI Approved :: GNU General Public License v2 or later
(GPLv2+)",
+ ],
+)
--
To view, visit https://gerrit.wikimedia.org/r/233478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1dfe3b85a6ae763b4a1cc46643037ec4eeff95b1
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
