From 26484bb11dd87f2d3d06483ac29b7862aeb1fe15 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 28 Sep 2007 11:57:20 -0400 Subject: Bump func version for release, add BuildRequires + logrotate script --- MANIFEST.in | 3 +-- etc/func_rotate | 19 +++++++++++++++++++ func.spec | 7 +++++++ setup.py | 8 +++++--- version | 2 +- 5 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 etc/func_rotate diff --git a/MANIFEST.in b/MANIFEST.in index 169d435..a81777a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,5 @@ include version -include etc/minion.conf -include etc/certmaster.conf +recursive-include etc * recursive-include docs * recursive-include init-scripts * recursive-include po *.po diff --git a/etc/func_rotate b/etc/func_rotate new file mode 100644 index 0000000..e12edfb --- /dev/null +++ b/etc/func_rotate @@ -0,0 +1,19 @@ +/var/log/func/audit.log { + missingok + notifempty + rotate 4 + weekly + postrotate + if [ -f /var/lock/subsys/funcd ]; then + /etc/init.d/funcd condrestart + fi + endscript +} + +/var/log/func/func.log { + missingok + notifempty + rotate 4 + weekly +} + diff --git a/func.spec b/func.spec index a970c0f..b0547b9 100644 --- a/func.spec +++ b/func.spec @@ -12,6 +12,7 @@ Group: Applications/System Requires: python >= 2.3 Requires: rhpl Requires: pyOpenSSL +BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArch: noarch Url: https://hosted.fedoraproject.org/projects/func/ @@ -44,6 +45,7 @@ rm -fr $RPM_BUILD_ROOT %dir %{_sysconfdir}/pki/%{name} %config(noreplace) /etc/func/minion.conf %config(noreplace) /etc/func/certmaster.conf +%config(noreplace) /etc/logrotate.d/func_rotate %dir %{python_sitelib}/func %dir %{python_sitelib}/func/minion %dir %{python_sitelib}/func/overlord @@ -72,6 +74,11 @@ fi %changelog +* Fri Sep 28 2007 Michael DeHaan - 0.0.12-1 +- bump version and get ready for first public release +- add BuildRequires python-devel +- add logrotate config + * Thu Sep 27 2007 Jesus Rodriguez - 0.0.11-7 - removed unnecessary yum-utils Require diff --git a/setup.py b/setup.py index ac67d0b..c908534 100644 --- a/setup.py +++ b/setup.py @@ -18,6 +18,7 @@ if __name__ == "__main__": initpath = "/etc/init.d/" logpath = "/var/log/%s/" % NAME pkipath = "/etc/pki/%s" % NAME + rotpath = "/etc/logrotate.d" setup( name="%s" % NAME, version = VERSION, @@ -45,9 +46,10 @@ if __name__ == "__main__": (manpath, ["docs/funcd.1.gz"]), (manpath, ["docs/certmaster.1.gz"]), (manpath, ["docs/certmaster-ca.1.gz"]), - (logpath, []), - (etcpath, []), - (pkipath, []) + (rotpath, ['etc/func_rotate']), + (logpath, []), + (etcpath, []), + (pkipath, []) ], description = SHORT_DESC, long_description = LONG_DESC diff --git a/version b/version index 5376242..510a262 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.11 6 +0.12 1 -- cgit