summaryrefslogtreecommitdiffstats
path: root/misc/bcfg2.spec
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Chris St. Pierre2014-04-251-31/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: misc/bcfg2.spec src/lib/Bcfg2/Client/Client.py src/lib/Bcfg2/Client/Tools/APK.py src/lib/Bcfg2/Client/Tools/MacPorts.py src/lib/Bcfg2/Client/Tools/Pacman.py src/lib/Bcfg2/Client/Tools/YUM.py src/lib/Bcfg2/Server/Admin/Minestruct.py src/lib/Bcfg2/Server/Admin/Pull.py src/lib/Bcfg2/Server/Admin/Viz.py src/lib/Bcfg2/Server/Core.py src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py src/lib/Bcfg2/Server/Plugins/Properties.py src/lib/Bcfg2/settings.py src/sbin/bcfg2-crypt src/sbin/bcfg2-info src/sbin/bcfg2-lint src/sbin/bcfg2-yum-helper testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py
| * misc/bcfg2.spec: Bumped release and added a changelog entryJonathan Billings2014-04-231-1/+4
| |
| * misc/bcfg2.spec: Remove second, unnecessary %endifJonathan Billings2014-04-231-5/+5
| |
| * misc/bcfg2.spec Remove duplicate checks for systemd in RPM scriptletsJonathan Billings2014-04-231-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | In the RPM scriptlets, there's first a check for fedora 18 or greater, then if that's not true, a check for fedora 16 or greater. Due to some bug in how nested %if statements work in RPM scriptlets, the second test is evaluating true even on non-Fedora systems, which is leading to systemd commands being put in RHEL6 RPM scriptlets. This change removes the second check. If there needed to be a check for versions of Fedora 16 and 17, they will no longer work, but since neither of those are supported versions of Fedora, I suspect we don't need to include logic for them.
* | Merge branch 'maint' into masterSol Jerome2014-04-161-27/+315
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com> Conflicts: doc/appendix/guides/import-existing-ssh-keys.txt misc/bcfg2.spec src/lib/Bcfg2/Client/Tools/VCS.py src/lib/Bcfg2/Client/Tools/YUM.py src/lib/Bcfg2/Encryption.py src/lib/Bcfg2/Reporting/Collector.py src/lib/Bcfg2/Reporting/Storage/DjangoORM.py src/lib/Bcfg2/Server/Core.py src/lib/Bcfg2/Server/FileMonitor/__init__.py src/lib/Bcfg2/Server/Lint/RequiredAttrs.py src/lib/Bcfg2/Server/Plugin/helpers.py src/lib/Bcfg2/Server/Plugins/Metadata.py src/lib/Bcfg2/Server/Plugins/Packages/Yum.py src/lib/Bcfg2/Server/Plugins/Packages/__init__.py src/lib/Bcfg2/settings.py src/sbin/bcfg2-crypt src/sbin/bcfg2-reports src/sbin/bcfg2-yum-helper testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/TestAugeas.py
| * misc/bcfg2.spec: reconcile w/Fedora: re-enable unit tests in EL7John Morris2014-04-061-9/+9
| | | | | | | | | | | | | | EL7 deps needed for unit tests (pylibacl, python-pep8, pylint) now built for EPEL7. https://bugzilla.redhat.com/show_bug.cgi?id=1058427
| * Version bump to 1.3.4Sol Jerome2014-02-251-2/+2
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * bcfg2.spec: Fix changelog date orderSol Jerome2014-02-251-6/+6
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * misc: only require gamin for building on RHEL < 7Chris St. Pierre2014-02-131-6/+5
| |
| * misc: build requires gamin-python to properly generate docsChris St. Pierre2014-02-131-1/+2
| |
| * misc/bcfg2.spec: Bump releaseJohn Morris2014-02-031-1/+1
| | | | | | | | Forgot this somewhere; already bumped in %changelog
| * misc/bcfg2.spec: merge recent Fedora changesJohn Morris2014-02-031-5/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary: EPEL7 updates; EPEL5 bcfg2-web pkg disabled; CherryPy disabled * Sat Feb 1 2014 John Morris <john@zultron.com> - 1.3.3-4 - Disable bcfg2-web package on EL5; bz #1058427 - Disable %%check on EL7; missing EPEL deps - BR: systemd to pick up _unitdir macro * Mon Jan 27 2014 Sol Jerome <sol.jerome@gmail.com> - 1.3.3-4 - Fix BuildRequires for EPEL7's Django - Remove unnecessary client-side lxml dependency - Add Django dependency for bcfg2-web (the web package *does* require Django for the database) - Fix OS detection for RHEL7 initscripts * Sun Dec 15 2013 John Morris <john@zultron.com> - 1.3.3-3 - Remove unneeded Django dep in 'web' package, bz #1043229 * Sun Nov 24 2013 John Morris <john@zultron.com> - 1.3.3-2 - Fix CherryPyCore.py exclude glob to include compiled files - Disable server-cherrypy package build to make Fedora buildsys happy * Thu Nov 07 2013 Sol Jerome <sol.jerome@gmail.com> 1.3.3-1 - New upstream release
| * misc/bcfg2.spec: Merge changelog from epelSol Jerome2014-01-271-0/+250
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * misc/bcfg2.spec: Pull in cherrypy toggle from epelSol Jerome2014-01-271-1/+16
| | | | | | | | | | | | | | This allows one to disable building of the bcfg2-server-cherrypy package. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * misc/bcfg2.spec: Fix bcfg2-web Requires for EPEL7Sol Jerome2014-01-271-1/+6
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * misc/bcfg2.spec: Fix BuildRequires for RHEL7Sol Jerome2014-01-241-0/+5
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * misc/bcfg2.spec: Remove upstream release commentsSol Jerome2013-12-161-24/+0
| | | | | | | | | | | | | | | | We don't need to make changelog edits every time there's a new release. This just clutters up the changelog without adding any useful information. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * misc/bcfg2.spec: Use systemd scripts on RHEL7Sol Jerome2013-12-161-3/+3
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | Merge branch 'maint'Chris St. Pierre2013-12-091-3/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/appendix/guides/fedora.txt misc/bcfg2.spec schemas/types.xsd src/lib/Bcfg2/Encryption.py src/lib/Bcfg2/Options.py src/lib/Bcfg2/Server/Admin/Client.py src/lib/Bcfg2/Server/Core.py src/lib/Bcfg2/Server/Lint/Validate.py src/lib/Bcfg2/Server/Plugin/helpers.py src/lib/Bcfg2/Server/Plugins/Bundler.py src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py src/lib/Bcfg2/Server/Plugins/Probes.py src/sbin/bcfg2-crypt testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py testsuite/common.py testsuite/install.sh
| * bcfg2.spec: Remove unnecessary replacementSol Jerome2013-11-181-3/+0
| | | | | | | | | | | | | | Our cron job is smart enough to work in any libexec directory. These replacements are unnecessary. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * misc/bcfg2.spec: lxml not required on the clientSol Jerome2013-11-141-1/+0
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | bumped spec file version to 1.4.0, configured for nightly buildsChris St. Pierre2013-11-141-3/+5
| | | | | | | | | | This is a re-commit of 0dc94564d9f7ba5065f3facfc864718b478370e0, which got reverted during a merge.
* | Merge branch 'maint'Chris St. Pierre2013-11-111-2/+5
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/lib/Bcfg2/Server/Admin/Compare.py src/lib/Bcfg2/Server/Admin/Snapshots.py src/lib/Bcfg2/Server/MultiprocessingCore.py src/lib/Bcfg2/Server/Plugins/Probes.py src/sbin/bcfg2-crypt src/sbin/bcfg2-reports tools/upgrade/1.3/migrate_configs.py tools/upgrade/1.3/migrate_perms_to_mode.py
| * Version bump to 1.3.3v1.3.3Sol Jerome2013-11-071-2/+5
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | Merge branch 'maint'Sol Jerome2013-11-041-6/+0
|\| | | | | | | | | Conflicts: doc/server/admin/index.txt
| * misc/bcfg2.spec: Remove more unnecessary requiresSol Jerome2013-10-301-2/+0
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * misc/bcfg2.spec: Remove some unnecessary requiresSol Jerome2013-10-301-4/+0
| | | | | | | | | | | | | | While a lot of these dependencies can be useful, they aren't necessarily required unless you expect to use particular functionality. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | DB: fixed how Django settings are loadedChris St. Pierre2013-10-301-1/+1
| |
* | Merge branch 'maint'Chris St. Pierre2013-10-281-7/+5
|\| | | | | | | | | Conflicts: misc/bcfg2.spec
| * specfile: backported merge w/ Fedora specfile to 1.3Chris St. Pierre2013-10-281-180/+478
| |
| * New plugin: AWSTagsChris St. Pierre2013-09-261-0/+1
| | | | | | | | | | AWSTags allows querying tags from EC2, and setting groups based on the tag names or values.
* | specfile: removed bcfg2 1.3-ismsChris St. Pierre2013-10-281-9/+3
| |
* | specfile: GPG key was added as a source but unusedChris St. Pierre2013-10-281-4/+3
| |
* | SQLAlchemy is no longer usedChris St. Pierre2013-10-281-1/+0
| |
* | bumped spec file version to 1.4.0, configured for nightly buildsChris St. Pierre2013-10-281-2/+4
| |
* | fixed various issues listed at https://github.com/Bcfg2/bcfg2/pull/131Chris St. Pierre2013-10-281-27/+37
| |
* | misc/bcfg2.spec: BuildRequires: buildsys-macros for el5John Morris2013-10-281-0/+7
| | | | | | | | | | | | | | | | By default, el5 doesn't have the %%rhel macro, provided by the buildsys-macros package. EPEL build servers install buildsys-macros by default, but explicitly requiring it may help builds in other environments
* | Drop source xml.xsd; included in upstream tarballJohn Morris2013-10-281-2/+1
| |
* | remove /etc/bcfg2-web.confJohn Morris2013-10-281-3/+1
| |
* | Disable pylint and pep8 unit tests on redhatJohn Morris2013-10-281-0/+13
| |
* | Add two installed but unpackaged files to %filesJohn Morris2013-10-281-0/+2
| |
* | misc/bcfg2.spec: fix macrosJohn Morris2013-10-281-11/+13
| | | | | | | | Apparently I made up %elif.
* | reconcile: 1.3.2-2 bump release and add %changelogJohn Morris2013-10-281-1/+19
| |
* | misc/bcfg2.spec: reconcile: %filesJohn Morris2013-10-281-39/+47
| |
* | misc/bcfg2.spec: reconcile: %pre and %post scriptsJohn Morris2013-10-281-41/+126
| | | | | | | | Both old init scripts and new systemd units
* | misc/bcfg2.spec: reconcile: %install scriptJohn Morris2013-10-281-47/+75
| | | | | | | | | | | | | | | | | | - remove %{__install} and other such macros, no longer used in Fedora - use init scripts from redhat/scripts rather than debian - systemd unit file installation - install Examples - move %check section up - fix some macros
* | misc/bcfg2.spec: reconcile: add the new %check scriptJohn Morris2013-10-281-1/+18
| |
* | misc/bcfg2.spec: reconcile: %prep and %buildJohn Morris2013-10-281-5/+18
| |
* | misc/bcfg2.spec: reconcile: Add -pre/-rc macroJohn Morris2013-10-281-36/+93
| |
* | misc/bcfg2.spec: reconcile w/Fedora; %package section rearrangementsJohn Morris2013-10-281-35/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specfile reconciliation w/Fedora: Sol Jerome requested the differences between misc/bcfg2.spec and the Fedora specfile be reconciled as much as possible. This will hopefully make updates easier for distro packagers (like me), and also help keep misc/bcfg2.spec up to date. The approach is to pick one feature at a time and massage both upstream and Fedora versions so that they match as much as possible after several easy-to-understand commits on each side. Beneficial features present in one but not the other will be preserved in both. Unfortunately, they will never match perfectly since misc/bcfg2.spec maintains support for non-RedHat distros. I believe Fedora Packaging Guidelines does not permit the extra macros (this statement should be verified). An additional goal is to make the diff between the two minimal and easy to read. ------------------ - Rearrange %package sections - Add bcfg2-examples package - Reconcile Summary: and Group: tags - Remove unneeded Version: tags from subpackages