valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,369 Commits 24 Branches 182 Tags 341 MiB
f61e8d6366
Commit Graph

622 Commits

Author SHA1 Message Date
Colton Myers
c1e630340e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/fileserver/gitfs.py
	salt/grains/core.py
 2015-01-22 16:46:32 -07:00
Nahum Shalman
32c222f8f2 SmartOS Esky: fix build version identification 
"bdist" doesn't do the right thing in the absence of
version files produced by "sdist".
Run "sdist" then extract out the contents of the tarball
into place
 2015-01-21 20:06:48 -05:00
Roman Inflianskas
0b4f05236b [fish shell completion] updated comments 2015-01-08 15:30:29 +03:00
Colton Myers
f6eae029f0 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	pkg/windows/installer/Salt-Minion-Setup.nsi
	salt/grains/core.py
	salt/minion.py
	salt/modules/mongodb.py
	salt/states/archive.py
	salt/states/mount.py
	salt/utils/master.py
	salt/utils/schedule.py
	salt/utils/thin.py
	tests/jenkins-ng.py
 2015-01-06 13:14:27 -07:00
Roman Inflianskas
2d7e1d4809 [fish shell completion] adopt for non-interactive usage (e.g. from scripts) 2015-01-06 21:31:19 +03:00
Loren Gordon
7f7c7bd337 Update vcredist version, fixes saltstack/salt#19387 
Install the most current version of vcredist, Microsoft Visual C++ 2008
Service Pack 1 Redistributable Package MFC Security Update.
 2015-01-06 12:18:13 -05:00
Loren Gordon
a1d7868d64 Update vcredist version, fixes saltstack/salt#19387 
Install the most current version of vcredist, Microsoft Visual C++ 2008
Service Pack 1 Redistributable Package MFC Security Update.
 2015-01-06 12:02:36 -05:00
Justin Findlay
ad33589fac move requirements files into requirements dir 2014-12-27 17:29:03 -07:00
Tiru Srikantha
d1192819c5 Change URL for vcredist_x64 to SP1 DL URL 
Fixes saltstack/salt#18935
 2014-12-11 14:27:32 -08:00
Pedro Algarvio
733b31da23 Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
 2014-11-27 03:59:40 +00:00
C. R. Oldham
f41cc45a8f Switch nssm back to 32-bit 2014-11-26 13:35:53 -07:00
Niels Abspoel
3d9fa5ce1c Updated suse spec file to salt 2014.7 2014-11-19 22:48:12 +01:00
Thomas S Hatch
2be11167d6 Merge pull request #18140 from rominf/fish-completion 
fish shell completion: fix broken arguments completion
 2014-11-17 17:14:28 -07:00
Arjan de Vries
e01c27d225 Fix Silent install added option /SD to messagebox 2014-11-10 15:58:53 +01:00
Colton Myers
0cc0d64136 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/hg.py
 2014-10-31 16:14:34 -06:00
C. R. Oldham
6c9be002c5 Update nssm to 2.24 2014-10-30 22:15:26 -04:00
Niels Abspoel
faaeb57759 Updated spec file to 2014.1.13 2014-10-27 22:47:30 +01:00
Erik Johnson
33a74e422e Update Fedora/RHEL spec for 2014.1.13 2014-10-17 10:46:14 -05:00
Roman Inflianskas
49fca16fb4 fish shell completion: fix broken arguments completion 2014-10-12 13:51:47 +04:00
Erik Johnson
713f3ecc73 Spelling fixes 2014-10-11 20:13:45 -05:00
Niels Abspoel
5fd3ef480f updated salt.spec file for suse: 
this fixes #16560
 2014-10-11 20:29:52 +02:00
Erik Johnson
b18ae95f84 Update RPM spec for 2014.1.11 2014-10-01 18:35:23 -05:00
Colton Myers
99e97320e1 Merge branch '2014.7' into develop 
Conflicts:
	doc/ref/configuration/minion.rst
	doc/ref/states/requisites.rst
	doc/topics/troubleshooting/master.rst
	doc/topics/tutorials/index.rst
	doc/topics/tutorials/intro_scale.rst
	salt/config.py
	salt/key.py
	salt/master.py
	salt/minion.py
	salt/modules/file.py
	salt/modules/hashutil.py
	salt/modules/lxc.py
	salt/modules/oracle.py
	salt/modules/tls.py
	salt/modules/win_update.py
	salt/pillar/pepa.py
	salt/pillar/s3.py
	salt/states/augeas.py
	salt/states/win_update.py
	salt/tops/ext_nodes.py
	salt/utils/master.py
 2014-09-22 14:22:54 -06:00
David Boucha
25303c586f remove problematic expect fork 2014-09-18 10:40:05 -06:00
Roman Inflianskas
ef2b3d81b9 fish shell completion: merge 2014-09-13 14:45:20 +04:00
Roman Inflianskas
f986dee05a fish shell completion: fix remote cmd completion for cmd.run and similar 2014-09-13 14:33:53 +04:00
Pedro Algarvio
781092daaa Merge branch '2014.7' into develop 2014-09-11 22:42:04 +01:00
Jille Timmermans
a8e3586aa1 Some textual fixes 2014-09-11 14:45:44 +02:00
Roman Inflianskas
7b5b3f2c11 fish shell completion: add help for arguments 2014-09-11 13:10:06 +04:00
Roman Inflianskas
ecf7ddacf6 fish shell completion: move salt options to salt file 2014-09-11 13:10:06 +04:00
Nahum Shalman
adc71a4de9 SmartOS esky: build needs to invoke sdist 
per saltstack/salt#15405
 2014-09-10 16:29:13 -04:00
C. R. Oldham
06fac568bd Merge pull request #15665 from rominf/fish-completion 
fish shell completion: add remote cmd complition for cmd.run and similar
 2014-09-10 14:01:33 -06:00
Roman Inflianskas
8e19313fa9 fish shell completion: add remote cmd complition for cmd.run and similar 2014-09-10 23:56:44 +04:00
David Boucha
810d2a6d9a Merge pull request #15664 from UtahDave/2014.7fixreg 
replace version with a jinja variable
 2014-09-10 13:55:23 -06:00
David Boucha
df91a0929a replace version with a jinja variable 2014-09-10 13:52:13 -06:00
Thomas S Hatch
0004ff8898 Merge branch '2014.7' into develop 2014-09-09 11:20:29 -06:00
Nahum Shalman
aa0e7209c5 SmartOS Esky: Fix minion SMF manifest 
Some users reported an errror that SMF couldn't find auditconfig despite
the fact that the PATH is set correctly. Invoking with the full path
seems to fix the issue.
 2014-09-08 16:07:48 -04:00
Thomas S Hatch
647490b677 Merge pull request #15567 from rominf/fish-completion 
Fish completion improvements
 2014-09-06 16:33:34 -06:00
Roman Inflianskas
6b244f8326 fish shell completion: add syndic completion 2014-09-06 14:09:45 +04:00
Roman Inflianskas
83fc5374bc fish shell completion: make it possible use completions without salt-master installed 2014-09-06 14:09:20 +04:00
Thomas S Hatch
2f6ae96f37 Merge branch '2014.7' into develop 
Conflicts:
	salt/client/ssh/__init__.py
 2014-09-03 14:43:07 -06:00
Erik Johnson
cbdee403bd Add salt-api unit file symlink 2014-09-03 13:42:21 -05:00
Mike Place
be60e25574 Merge branch '2014.7' into develop 2014-09-02 13:56:54 -06:00
Nahum Shalman
df7736b530 SmartOS esky: fix odd problem with zeromq linking 2014-09-01 12:50:07 -04:00
Roman Inflianskas
4fc7b4b1e4 add fish shell completions for salt programs 2014-08-27 18:59:15 +04:00
Colton Myers
ad89a752f8 Merge branch '2014.7' into develop 
Conflicts:
	salt/cloud/__init__.py
	salt/utils/cloud.py
 2014-08-25 13:29:29 -06:00
Chris Rebert
fcc41721fd sodium_grabber_installer: fix kwarg spacing 
************* Module sodium_grabber_installer
pkg/smartos/esky/sodium_grabber_installer.py:16: [C0326(bad-whitespace), ] No space allowed around keyword argument assignment
    sources = [path.join(HERE, 'sodium_grabber.c')],
            ^
pkg/smartos/esky/sodium_grabber_installer.py:17: [C0326(bad-whitespace), ] No space allowed around keyword argument assignment
    libraries = ['sodium'],
              ^
 2014-08-22 12:04:34 -07:00
Thomas S Hatch
f0009be6c2 Merge branch '2014.7' into develop 2014-08-21 17:20:26 -06:00
Nahum Shalman
d0dac42958 SmartOS esky build environment instructions cleanup 2014-08-21 17:37:55 -04:00
Nahum Shalman
cdae8948a1 SmartOS esky packaging of 2014.7 
Resulting builds can be used either with zeromq or with raet
 2014-08-21 16:01:46 -04:00
Chris Rebert
baa4f852df fix typo: Feauture => Feature 2014-08-11 11:00:23 -07:00
Erik Johnson
17049624ea Fix incorrect conditional in spec 2014-08-10 12:20:30 -05:00
Thomas S Hatch
e311dae191 Merge pull request #14761 from terminalmage/update-spec 
Update RPM spec for 2014.1.10
 2014-08-08 15:57:43 -06:00
Thomas S Hatch
616e61f663 Merge pull request #14742 from steverweber/fix_stuff 
catch exceptions and fix some vars
 2014-08-06 11:58:00 -06:00
Erik Johnson
5f9931636a Deploy /var/cache/salt with common RPM 
Also changed the deprecated $RPM_BUILD_ROOT to %{buildroot}.
 2014-08-05 22:15:34 -05:00
steve
bc3ade860c catch exceptions and fix some vars 2014-08-05 22:39:57 -04:00
Erik Johnson
670e315c19 Update RPM spec for 2014.1.10 2014-08-05 17:02:35 -05:00
Colton Myers
13995afba0 Merge branch '2014.7' into develop 
Conflicts:
	doc/topics/releases/2014.7.0.rst
 2014-08-05 15:32:04 -06:00
Nahum Shalman
7a0044a8f5 SmartOS Esky: py27-mysqldb in build environment 
Requested by @johngrasty
 2014-08-04 16:15:17 -04:00
Niels Abspoel
d9bfda2dcd This fixes two issues #14337 and #13788 
use-forking-daemon.patch -> #14337
the other patchesr are for #13788

With thanks to Tim Serong who created the patches.
 2014-07-29 20:34:12 +02:00
Elias Probst
43589f380d Drop outdated ebuilds. Maintained now by Gentoo in app-admin/salt 2014-07-23 10:52:11 +02:00
Seth House
95f31c591d Fix 'stop' for RedHat salt-api init script 2014-07-21 20:46:26 -06:00
Thomas S Hatch
63ea2267cd Merge pull request #14216 from cro/portfile 
Update MacPorts Portfile
 2014-07-14 17:14:37 -06:00
C. R. Oldham
3f0b561cb4 Next iteration of the Portfile 2014-07-14 15:36:11 -06:00
C. R. Oldham
a1d7e44d84 Use plists in "pkg/darwin" instead 2014-07-14 12:26:38 -06:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
David Boucha
ea12719881 bump windows installer version 2014-07-12 23:18:58 -06:00
Niels Abspoel
5b451d7e2d updated suse spec file for 2014.1.7 2014-07-11 19:50:06 +02:00
Erik Johnson
1197a06716 Update spec for 2014.1.7 2014-07-10 20:52:00 -06:00
C. R. Oldham
88c2fd3872 Portfile and .plist files for MacPorts 2014-07-10 11:20:26 -06:00
Thomas S Hatch
779aa72367 Merge pull request #14070 from nshalman/requirements 
SmartOS esky build: requirements files
 2014-07-09 21:23:23 -06:00
C. R. Oldham
46fdc9b5dd Portfile and .plist files for MacPorts 2014-07-09 16:46:02 -06:00
Nahum Shalman
7fbe259eea SmartOS esky build: requirements files 
Mimicking the breakout of requirements files in the main project,
this allows me to keep a file of extra requirements that get put in the
esky (e.g. halite) while only needing to point the build process at
either the zeromq or raet requirements file.
 2014-07-09 17:49:46 -04:00
Thomas S Hatch
199b2bc2a9 Merge pull request #13895 from jeteokeeffe/patch-2 
Adding logrotate script for salt in rpm
 2014-07-02 10:16:47 -06:00
Jete
31c3267e59 Adding logrotate script for salt in rpm 2014-07-01 17:05:27 -04:00
Jete
323de1e833 Adding logrotate file 
Adding logrotate file for salt logs
 2014-07-01 17:02:20 -04:00
Jesse Collier
e04043aabd Adding expect fork to upstart script 2014-06-25 13:33:56 -07:00
bhepple
ed3166990c Update salt-minion 
On our RHEL5 systems we're getting 2 and sometimes 3 or more salt-minions started. Somehow the check on /var/run/salt-minion.pid doesn't prevent this.

This patch stops the registered process and kills any further salt-minion processes, first trying -TERM and then -KILL signals.

It may be that other distros would like to use this same logic to tidy up, in which case the new code can be moved into place as appropriate.
 2014-06-25 14:58:02 +10:00
Erik Johnson
aa9ae49129 Add additional information to the comments for the shar script 2014-06-23 16:00:19 -05:00
Matthieu Guegan
49419f94c3 Add a method context environment PATH 
Some modules are referring to PATH env variable which do not contains /opt/local/.. paths by default. This fix provides correct PATH handling
 2014-06-22 11:38:35 +02:00
Thomas S Hatch
a65bdce734 Merge pull request #13573 from nshalman/smartos-audit-context 
SmartOS: run salt minion in an audit context
 2014-06-19 14:48:38 -06:00
Nahum Shalman
3e5742bb73 SmartOS: run salt minion in an audit context 
This fixes an issue @njones11 was having with
multiple cron.present states.

"crontab -l <username>" would fail, so the temp file
would be empty, a given cronjob would go in
and then the "su - <username> crontab <temp file>" would
succeed.

This evaded debugging attempts because if you invoked the salt
minion manually from a login shell, an audit context would
already exist and the "crontab -l <username>" would succeed.

The hint was a message in the debug log of:
[ERROR   ] Command 'crontab -l legion' failed with return code: 1
[ERROR   ] stderr: crontab: The audit context for your shell has not
been set.

We explicitly set up an audit context when launching the salt minion
which allows "crontab -l <username>" to succeed.

This may fix other issues and something similar
should perhaps be applied to pkg/smartos/salt-minion.xml

"5417" was chosen arbitrarily
 2014-06-19 16:11:49 -04:00
Erik Johnson
54e47ca522 Use bash for build_shar.sh 
Bourne shell doesn't support arrays
 2014-06-19 15:04:10 -05:00
Seth House
53bab586f4 Merged salt-api into Salt 
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
 2014-06-18 22:13:56 -06:00
Seth House
057a3ca723 Renamed PKGBUILD files to not conflict with Salt-core PKGBUILDs 2014-06-18 19:28:03 -06:00
Seth House
210ecf4a50 Moved salt-api.spec file to corresponding Salt-core directory 2014-06-18 19:25:56 -06:00
Niels Abspoel
c950a14e64 updated suse spec file for 2014.1.5 2014-06-13 21:18:36 +02:00
Pedro Algarvio
7bd8b1360f Remove remaining exsel code 2014-05-29 01:32:54 +01:00
David Boucha
679b178111 bump windows installer version number 2014-05-19 17:57:50 -06:00
Erik Johnson
82960a7480 Update RPM spec for 2014.1.4 2014-05-10 00:06:33 -05:00
Erik Johnson
a9a951df26 Dispose of temp virtualenv before installing deps 2014-05-09 00:05:40 -05:00
Erik Johnson
0bd6ec2282 Update build_shar.sh 
Added the following arguments

* -p - specify prefix
* -d - specify directory containing pre-downloaded dependency tarballs

Additional tweaks:

* Switched to using virtualenv to ensure that a new enough version of
  pip is available. Older pip seems to have issues with downloading the
  dependencies, silently failing to download certain tarballs. This
  removes the hard dep on python-pip, and adds python-virtualenv as a
  hard dep.

* Detect bundled zeromq in pyzmq tarball, and use it instead of trying
  to fetch it. This, coupled with the new -d option, allows for the
  entire stack of deps to be frozen for consistency in packaging.
 2014-05-08 22:03:16 -05:00
Nahum Shalman
6af019d7cf smartos esky: improve "installer" 
detect if this is a global or non-global zone
global zones are always minions

if the user passes in the name/address of the master
we configure a minimal minion file and launch the minion
 2014-05-08 12:04:22 -04:00
Erik Johnson
9b38263b4f Add /opt/share/man to MANPATH 2014-05-06 22:51:00 -05:00
Erik Johnson
c3e89eeceb Compress man pages 2014-05-06 22:50:39 -05:00
Pedro Algarvio
31033aac6b Merge pull request #12545 from aboe76/suse_spec_update 
updated suse spec file for 2014.1.4
 2014-05-06 06:02:19 +01:00
Erik Johnson
e11f1e4564 remove errexit 2014-05-05 13:40:19 -05:00
Niels Abspoel
98d32aa37e updated suse spec file for 2014.1.4 2014-05-05 20:39:19 +02:00
Ryan Davis
8fdced7877 windows: update to nssm 2.21.1 
new 32-bit binary for nssm.exe, upgrading from the previous 2.16.

Has some bug fixes, see http://nssm.cc/changelog.

Driving impetus to upgrade was "Silently ignore INTERROGATE control.",
on win2012 nssm spews ~30 event log messages per minute.

Tested by stopping windows minion, replacing nssm.exe, and restarting.
 2014-05-02 09:13:00 -04:00
Dennis Herbrich
f1a8a538fc Fix typo in Type declaration of systemd unit 
The systemd service type must be declared in lower case, otherwise systemd generated a warning and ignores the declaration.
 2014-04-23 15:11:00 +02:00
Erik Johnson
4e3430d751 Fix comments in shar build script 2014-04-21 16:38:34 -05:00
Erik Johnson
5ed7be5b2e Update spec file for 2014.1.3 2014-04-18 18:19:14 -05:00
Niels Abspoel
5cd37adb7d updated suse spec file to 2014.1.3 2014-04-18 20:35:33 +02:00
David Boucha
9c5880c188 bump windows installer version 2014-03-31 13:33:39 -06:00
Thomas S Hatch
28dd3e17e5 Merge pull request #11523 from dlanderson/no_su_upstart 
Remove "su -c" from upstart scripts
 2014-03-26 12:14:48 -06:00
David Anderson
31d7d327be Remove "su -c" from upstart scripts 2014-03-25 16:10:08 -06:00
Niels Abspoel
2a39b57155 updated suse release to 2014.1.1 2014-03-25 21:08:36 +01:00
Thomas S Hatch
3cbf31bd80 Merge pull request #11440 from pzbitskiy/nsis-vc-redist 
Check for VC 2008 redist package in Windows installer
 2014-03-24 15:39:30 -06:00
Pedro Algarvio
9ec00d2834 Fix wrong permissions 2014-03-23 18:22:35 +00:00
pzbitskiy
b25d21f666 Check for VC 2008 redist package in Windows installer 
* Download and install vcredist_x86 / vcredist_x64 if needed
* Fix for #10716
 2014-03-22 17:31:05 +04:00
Daniel Wallace
198e3eee8a Yay systemd.daemon.notify 
requires the python2 systemd bindings
 2014-03-14 08:19:52 -05:00
Erik Johnson
381d6ac305 Add shar pkg build script 2014-02-28 21:48:15 -06:00
Thomas S Hatch
6085b921bf Merge pull request #10785 from terminalmage/rhel6-upstart 
Add RHEL6-specific upstart config files
 2014-02-26 12:54:11 -07:00
Erik Johnson
08d90a7beb Add RHEL6-specific upstart config files 
RHEL6 doesn't use the net-device-up and local-filesystems targets,
meaning that if someone decides to use this upstart config then the
master/minion/syndic does not start on boot.

We don't deploy upstart configs in our RPMs, but this provides a working
upstart config file for those that wish to use it.
 2014-02-26 11:26:06 -06:00
Nahum Shalman
e62862f992 update documentation about SmartOS esky packaging 2014-02-25 19:27:39 -05:00
David Boucha
34a12d0929 bump windows installer version number 2014-02-25 09:58:34 -07:00
Niels Abspoel
f252aa2f29 Updated suse rpm specfiles for 2014-1 release 
removed symlinks to systemd service files now pypi tarball
includes pkg folder. Updated spec file to match these sources.
 2014-02-21 22:22:20 +01:00
Thomas S Hatch
655da0bd5c Merge pull request #10638 from terminalmage/rpm 
Update spec file for 2014.1.0
 2014-02-20 20:38:16 -07:00
Erik Johnson
3007e6882c Update spec file for 2014.1.0 2014-02-20 21:06:10 -06:00
Mike Place
a485eceac9 Fix all broken links in docs. Ignore certain known-good links. Adjust many links that are returning 301. 
Conflicts:
	doc/topics/installation/index.rst
 2014-02-20 16:16:59 -07:00
Tom Atkinson
4c87afbdc8 Fix service restart over salt 2014-02-18 20:37:53 +01:00
David Boucha
b44e681c5c release 0.17.5 Windows installers 2014-02-14 01:45:48 -07:00
Erik Johnson
708a95ddf4 Update RPM spec for 0.17.5 2014-01-27 15:54:26 -06:00
Alexey Ivanov
d23ff3821e
codespell: grammar nazi 
Run codespell[1] against sources.

[1] https://github.com/lucasdemarchi/codespell
 2014-01-26 18:41:28 -08:00
Niels Abspoel
ba4d1d54b0 updated suse rpm to 0.17.5 2014-01-25 22:18:01 +01:00
Nahum Shalman
3c179c2a41 SmartOS esky packaging: minor fixup 
Don't assume that the top directory is named "salt"
The user might choose to name it "salt-<version>"
or "saltstack" or whatever else.

install.sh is already that flexible; this fixes _syspaths.py
 2014-01-24 09:47:37 -05:00
Nahum Shalman
9f2a19ef05 SmartOS Esky Packaging: Fix PATH for services 
We ran into some weird issues with these SMF manifests
with certain critical binaries not being found in the PATH.

This PATH is derived from root's default PATH when logging
in to a SmartOS zone.
 2014-01-23 15:31:44 -05:00
Nathan Rini
73a839d637 Fix bug to allow for multiple PIDs to be returned 
Bug:
```
[root@pronghorn04 ~]# service salt-minion restart
Stopping salt-minion daemon:                               [  OK  ]
Starting salt-minion daemon: /etc/init.d/salt-minion: line 67: [: 22610:
unary operator expected
                                                           [  OK  ]
```

Traced bug:
```
++ pidof -c -o 21702 -o 21341 -o %PPID -x salt-minion
+ '[' 22610 7606 ']'
/etc/init.d/salt-minion: line 67: [: 22610: unary operator expected
```
 2014-01-15 15:50:41 -07:00
Michael Birtwell
9100506a64 Fix pkg/rpm/build.py when it's a release candidate 
Uses version.py to generate the complete version string
 2014-01-09 15:45:40 -07:00
Michael Birtwell
ead7af6fa0 Correctly filter the rpm SOURCES 2014-01-09 15:45:33 -07:00
Thomas S Hatch
ad526c972f Merge pull request #9588 from dmyerscough/fix-init-script 
Fix init script
 2014-01-06 10:47:56 -08:00
Damian Myerscough
65cde36f94 Fix #9511 multiple PID's cause unary operator expected 2014-01-06 19:46:33 +01:00
Damian Myerscough
c6ed4980dc Fix #9511 multiple PID's cause unary operator expected 2014-01-06 19:41:34 +01:00
Nahum Shalman
e94f42449a SmartOS esky build tooling 
This includes:
Notes on how I created a build environment
The _syspaths.py that allows the esky build to be installed anywhere
"Template" SMF manifests and an install script to import them
A script for building both the esky zip and a deployable tarball
 2014-01-05 11:20:24 -05:00
David Boucha
21c3ff1c70 bump Salt windows installer version 2013-12-26 10:40:19 -07:00
Niels Abspoel
7c817b4035 updated suse spec to 0.17.4 2013-12-25 08:42:09 +01:00
Erik Johnson
9718b9d024 Update RPM spec for 0.17.4 2013-12-19 11:33:02 -06:00
Matthew Williams
f89a3a466c syndic upstart: invoke via su so /etc/environment is read 2013-12-04 19:17:01 -08:00
Matthew Williams
2f1d42638f upstart scripts: invoke via su so /etc/environment is read 2013-12-04 19:09:59 -08:00
Mathieu Le Marec - Pasquet
5f46962e80 pep8 fixes 2013-12-04 00:25:50 +00:00
Thomas S Hatch
ae06ed74b3 Minor clean up on convenience rpm building function 2013-12-02 11:10:03 -07:00
Thomas S Hatch
e70b605471 Merge branch 'rpm_build_helper' of git://github.com/mbirtwell/salt into mbirtwell-rpm_build_helper 
Conflicts:
	pkg/rpm/salt.spec
 2013-12-02 11:07:59 -07:00
Erik Johnson
1ce0b5b5fa Remove unnecessary build requirement 2013-11-18 21:20:29 -06:00
Erik Johnson
d5604b3629 Update spec file for 0.17.2 2013-11-18 20:53:29 -06:00
Michael Birtwell
9879de8da7 Make buildid a argument 2013-11-13 14:58:30 +00:00
Michael Birtwell
b4e5114689 Add some stuff to make building rpms easier 
Conflicts:
	pkg/rpm/salt.spec
 2013-11-13 14:58:00 +00:00
Seth House
4f00fa256b Fixed occurances of "Salt Stack" to SaltStack 2013-11-07 10:46:41 -07:00
Niels Abspoel
a4e2da99a8 updated suse spec file for salt-api 0.8.3 2013-11-04 23:00:20 +01:00
Niels Abspoel
47b6a803e2 updated salt spec file for 0.17.1 
disabled unit testing until next version broken with salt-testing 0.5.2
 2013-11-04 22:55:08 +01:00
C. R. Oldham
8e53d5ff80 Back out earlier fix. 2013-10-31 17:04:58 -06:00
C. R. Oldham
5c58d4f245 Fix #4410, make sure that "ssh root@host -C service salt-minio restart" will return. 2013-10-25 17:20:10 -06:00
Wari Wahab
d2094f8b60 Fixed all typos I can find 2013-10-25 16:26:57 +08:00
David Boucha
ba0abb6810 Merge pull request #8073 from equinoxefr/update_nsis_installer 
Removing nsProcess plugin.
 2013-10-24 09:58:55 -07:00
EquinoxeFR
34c6f6c831 Removing nsProcess plugin. Using ExecWait and a sleep 3s to stop salt-minion. 2013-10-24 15:19:21 +02:00
Niels Abspoel
c349f1cbb2 updated suse spec to salt 0.17.1 2013-10-23 07:50:21 +02:00
Erik Johnson
1a884c59f1 Update RPM spec for 0.17.1 2013-10-22 15:28:49 -05:00
EquinoxeFR
f6ca119edc Adding close process and service stop to windows installer 2013-10-22 12:12:02 +02:00
David Anderson
6ef835899a Upstart scripts can source a virtualenv 2013-10-18 11:56:32 -06:00
David Boucha
746369d7b6 Bump Salt Windows installer version. Add to docs 2013-10-18 01:24:37 -06:00
David Boucha
45724660fb Bump windows installer version number 2013-10-08 11:31:19 -06:00
Erik Johnson
e75fc016fd pip not needed for EPEL5 package 2013-09-30 21:56:49 -05:00
Erik Johnson
d310dcbb80 Update initscripts, spec file for 0.17.0 
This also fixes an issue with sourcing of /etc/rc.d/init.d/functions in
RHEL/CentOS/Fedora/etc., allowing the use of /etc/default/salt to
override environment variables.
 2013-09-30 21:09:25 -05:00
Niels Abspoel
5ae7fb1b53 updated suse pkg, inline with package guidelines 2013-09-28 23:16:06 +02:00
Niels Abspoel
4677b0a2c0 updated suse spec to salt 0.17.0 
created salt-ssh as a separate package
improved dependencies per package
salt-master depends pyzmq and recommends halite
salt-minion depends pyzmq
salt dependency pyzmq removed.
 2013-09-27 21:58:18 +02:00
Erik Johnson
186c929c51 Fix sanity checks and defaults file sourcing 2013-09-13 12:48:50 -05:00
Erik Johnson
8376fd5284 Updated with 0.16.4-1 info 2013-09-13 12:47:20 -05:00
David Anderson
cabb8230f3 Fix https://github.com/saltstack/salt/issues/6785 2013-09-11 14:14:14 -06:00
Niels Abspoel
cc0fd3982a updated to 0.16.4 
The spec file is future ready for salt 0.17, this is commented
I have tested it on sles 11 sp3 and opensuse 12.3 vm.
 2013-09-08 00:59:34 +02:00
Niels Abspoel
1c9742d228 updated suse spec file 
Fixed non-executable-scripts warning from python checks
 2013-09-04 20:07:33 +02:00
Henrik Holmboe
0252dcd535 Configuration file for SuSEfirewall2 used in openSUSE 
This should probably be looked over by the Suse RPM package maintainer.
Untested on SLES.
 2013-09-04 14:34:48 +02:00
Seth House
3113ad190e Merge pull request #114 from sfdc-kho/develop 
Fix start/stop in init script
 2013-08-30 23:03:40 -07:00
Kim Ho
1de8f9686e Fix start/stop in init script 2013-08-30 11:03:16 -07:00
Florian La Roche
d9e11967a0 fixed preun/postun scripts for salt-minion for the Red Hat .spec file 2013-08-26 21:12:08 +02:00
Andrew Niemantsverdriet
c53e3717b0 Updating to version 0.16.3 2013-08-15 14:08:38 -06:00
David Boucha
21b6f8790f Bump minion version number. 2013-08-11 18:01:21 -06:00
Pedro Algarvio
92abe874cc Merge pull request #6611 from herlo/develop 
update rpm spec to 0.16.2
 2013-08-10 11:19:17 -07:00
Clint Savage
3deff7ac21 update rpm spec to 0.16.2 2013-08-10 12:12:48 -06:00
Niels Abspoel
8da9e9a116 updated suse spec file 
Made a symlink to salt-api init file used for rpm
updated symlink to salt-api.service

Improved salt-api rpm to be in line with lsb for suse inclusion.
 2013-08-09 22:56:36 +02:00
Niels Abspoel
2efed79b21 Updated suse spec file to 0.16.3 
Updated suse spec file to 0.16.3 bugfix release.
removed creation of /var/cache/salt/minion/proc dir.
not needed anymore
 2013-08-09 20:21:49 +02:00
David Boucha
57ef0dc0f7 bump Salt windows installer version to 0.16.2 2013-08-02 11:09:34 -06:00
Niels Abspoel
6c1abf5ab6 updated suse packages to 0.16.2 2013-08-02 08:18:25 +02:00
Pedro Algarvio
9be409e95b Merge pull request #6425 from UtahDave/lockdown_windows 
Set permissions on Salt dir
 2013-07-29 18:41:25 -07:00
David Boucha
5a48188f54 Set permissions on Salt dir 
Only allow Administrator's group and System user access to
c:\salt
 2013-07-29 19:07:52 -06:00
David Boucha
2b193b0a1d bump windows installer version 2013-07-29 18:59:48 -06:00
Niels Abspoel
2c7b6f82e5 updated salt package to 0.16.1 2013-07-29 20:35:09 +02:00
Thomas L. Kula
54a0746b4e Backoff when minion fails to connect 
NOTE: This is a potential change --- I haven't actually gotten a
test environment to try this out.

This adds a configuration option to the minion,
`acceptance_wait_time_max', that if set changes the acceptance
wait loop to add `acceptance_wait_time' seconds to the wait between
each iteration, up to this maximum value.

POTENTIAL FIX: Issue #5813
 2013-07-27 16:51:38 -04:00
Niels Abspoel
b4e1661c91 updated changes file to reflect 0.16.0 init fix 2013-07-18 07:37:00 +02:00
Niels Abspoel
0c610526bc Updated suse specs for 0.8.2 2013-07-18 07:29:33 +02:00
Clint Savage
a1729fb373 updating spec file to feature release 0.16.0 2013-07-11 17:13:00 -06:00
Niels Abspoel
4fa78a44f6 fix salt-syndic Fixes #5954. 2013-07-05 23:34:28 +02:00
Erik Johnson
6d70b85111 Fix bug in suse initscripts 
'rc status' is not valid for suse initscripts, 'rc_status' must be used
instead. Fixes #5954.
 2013-07-05 11:04:13 -05:00
Niels Abspoel
209f85c2ac updated suse package for release 0.16.0 2013-07-02 22:36:13 +02:00
pengyao
4fedff1b69 Add "-d" options to start salt-api 
In RHEL/CentOS, daemon should start in daemon mode, The salt-api will
start in frontgroud without "-d" options.
 2013-06-28 21:08:55 +08:00
Joseph Hall
d40c7ae7af Merge pull request #5685 from aboe76/develop 
updated salt.spec file for suse update 0.15.90
 2013-06-22 05:59:23 -07:00
David Boucha
c9b5223999 Bump Windows installer version number 2013-06-22 01:22:49 -06:00
Niels Abspoel
f72aa06d54 updated salt.spec file for suse update 0.15.90 
Improved salt init files to match fedora package
These could be merged into one.
replaced service files for symlinks to match fedora package
added README.suse to reflect package names for addition python modules
 2013-06-22 08:03:28 +02:00
Erik Johnson
524cc8bbb7 Add dependency on yum-utils 
This adds the depedency on yum-utils to to the RPM spec, as necessitated
by the change made to yumpkg5.py in 8f77216.
 2013-06-06 14:44:46 -05:00
Niels Abspoel
970c41ea8a Fixed bash-completion error 
typo
 2013-06-02 08:29:13 +02:00
Clint Savage
86a647a80f Merge branch 'develop' of git://github.com/saltstack/salt into develop 2013-06-01 22:35:24 -06:00
Clint Savage
972c8772fd update rpm spec to patch release 0.15.3 2013-06-01 22:35:13 -06:00
Niels Abspoel
2c1982aa17 updated suse salt.spec to 0.15.3 2013-06-02 00:14:33 +02:00
Thomas S Hatch
cd0f69ebbd Merge pull request #5361 from yinchuan/patch-2 
add resource limits in salt-master.upstart to correct issuse #5323
 2013-06-01 11:58:44 -07:00
Clint Savage
5b7c166d51 version needs to be 0.15.2 for salt.spec 2013-06-01 02:26:03 -06:00
yinchuan
11373966e4 add resource limits in salt-master.upstart to correct issuse #5323 
<https://github.com/saltstack/salt/issues/5323>
 2013-06-01 15:50:05 +09:00
David Boucha
4dd19fdb18 bump windows installer version number. 
0.15.3
 2013-05-31 18:29:01 -06:00
Clint Savage
d408ee67eb fixup dumb merge issues 2013-05-31 17:27:18 -06:00
Clint Savage
f5ac79fb37 upstream patch release 0.15.2 and patch to make tests run properly 2013-05-31 17:25:21 -06:00
mguegan
8ba8138bc4 pkg/smartos : fix the manifest of salt-master to start@boot 2013-05-30 20:33:16 +02:00
Niels Abspoel
f046e2e901 suse package updated to 0.15.2 
added salt user for salt-master daemon process
 2013-05-29 18:25:22 +02:00
Niels Abspoel
11df856bba Updated salt-git package with new features 
feautures:
- during installation a salt system user is created
- Creation of '/etc/salt/master.d/' for enhanced configuration
- salt-master run under own user 'salt'
- salt-user.conf created to set salt-master up for using salt system
  user
- added logrotate config files in appropriate place
- added bash-completion config files in appropriate place.
- Check if salt-master/salt-minion is running when upgrading
  and reexec / reload daemons accordingly
- Updated removal of salt package to remove 'cache' and 'log' dirs.
  and removal of salt system user.
- Made installation more verbose to communicate what happens.
 2013-05-25 22:27:21 +02:00
mguegan
89de6a1606 smartos : change default config directory for Salt services 2013-05-20 13:00:38 +02:00
Chris Rebert
e89cbf4447 capitalize Linux in comments/docs 2013-05-15 19:21:50 -07:00
mguegan
737b4e0fb2 pkg/smartos : add compatible manifests for the SmartOS platform 
Manifests in pkg/solaris are using /etc/salt which is innapropriate
for SmartOS design (/etc is removed @reboot). I suggest to add a
new directory in order to preserve existing Solaris installations
(and SmartOS one which are based on those manifests).
 2013-05-13 22:17:35 +02:00
Niels Abspoel
a76ed22ed1 Packaging: updated suse spec file for inclusion in opensuse:Factory. 
The suse package files are ready for opensuse release:
improved systemd unit support
removed some rpmlint bugs.
 2013-05-12 23:56:59 +02:00
Niels Abspoel
cc99c98343 updated suse spec file for inclusion in openSUSE:Factory. 
the package is now ready for opensuse release.
added logrotate and better systemd unit support.
removed some rpmlint bugs.
 2013-05-12 23:52:56 +02:00
mguegan
adc740f710 pkg/solaris : fix typo on salt-master's manifest 
A typo on salt-master's manifest prevents its start without salt-minion
on SunOS/Solaris/SmartOS platform. Tested on SmartOS
joyent_20130405T010449Z.
 2013-05-11 15:24:32 +02:00
Clint Savage
1013ea8e26 update rpm spec to patch release 0.15.1 2013-05-09 14:01:10 -06:00
Niels Abspoel
fdc6146faa updated salt.changes file 2013-05-08 23:50:06 +02:00
Niels Abspoel
48c1dfccec updated suse package for 0.15.1 release 2013-05-08 23:48:29 +02:00
Niels Abspoel
d6d60455cf added files for suse packaging 2013-05-07 20:40:18 +02:00
Clint Savage
076a3a60be update spec to 0.15.0 2013-05-07 11:29:50 -06:00
Andrew Niemantsvedriet
b60382600a Start in daemon mode by default 2013-05-07 09:53:18 -06:00
David Boucha
ca707eccff Turn off multiprocessing on Windows for now 2013-05-05 01:11:05 -06:00
David Boucha
1c7442ec19 Set windows installer to 0.15.0 2013-05-04 22:39:29 -06:00
Clint Savage
8aff76178f add 0.14.1 rpm spec 2013-05-04 14:11:37 -06:00
Niels Abspoel
8d4128d50e updated init files to have a /etc/default/salt to 
overwrite variables in init files.
updated spec file for 0.15.0 release
 2013-05-04 13:17:36 +02:00
deniskin82
39221190fe Fix in init script for RHEL/CentOS. Don't start the salt-minion if it's already running and there is no PID file 2013-05-03 16:18:42 -04:00
Niels Abspoel
10adfa9018 updated suse packaging: 
updated init files
added service files
added spec file
 2013-04-30 17:15:28 +02:00
David Boucha
c0aef8bccd Bump windows installer version 2013-04-26 10:03:28 -06:00
Niels Abspoel
ff5e539197 add archlinux PKGBUILDS 
- PKGBUILD -> 0.8.0
- PKGBUILD-giti:
  -branch develop
  - vcs version function from pacman 4.1
  - pkgver() function added
 2013-04-17 19:45:38 +02:00
Niels Abspoel
b515900810 updated to make use of pacman 4.1 vcs additions 
- pkgver() function -> this will make package version sane again
  no more date as package version
  pkg version will reflect salts internal version
- sample vcs supported branch/tags added
- removed old sources/md5sums not needed
 2013-04-17 19:13:39 +02:00
Niels Abspoel
b5027b2a8f add -d to start salt in daemon mode 
fixes stdout in cli environments
 2013-04-13 22:08:02 +02:00
Thomas S Hatch
721afb2ab5 disabel minion respawning with upstart 2013-04-10 16:47:40 -06:00
Sean Channel
e074f61985 add upstart 2013-04-10 08:42:26 -07:00
Fabian Topfstedt
4ce3ba2df1 Define normal exit return value to be 0 2013-04-10 15:07:28 +02:00
David Lindquist
73dc0874c2 service.start salt-minion hangs from console on CentOS 
Fixes #4410
 2013-04-06 14:59:28 -07:00
Kristofer M White
23bdcdf02a Correcting exec for salt-minion on OpenBSD 2013-04-01 20:54:28 -05:00
Jason R. McNeil
c4a4860820 Darwin launchd scripts 2013-03-30 21:52:15 -07:00
Thomas S Hatch
9e89c1dd1e Merge pull request #4241 from cedwards/PKGBUILD 
updated PKGBUILDs for 0.14.0 release
 2013-03-24 19:37:22 -07:00
Thomas S Hatch
18ece634f4 Merge pull request #4238 from aboe76/develop 
added pkg/suse specific init files
 2013-03-24 19:36:07 -07:00
Christer Edwards
21f48be9d5 updated PKGBUILDs for 0.14.0 release 2013-03-24 20:21:12 -06:00
Joseph Hall
93f502850e Merge pull request #4239 from herlo/develop 
update salt.spec to 0.14.0
 2013-03-24 16:45:41 -07:00
Clint Savage
7264bbc29e update salt.spec to 0.14.0 2013-03-24 17:16:42 -06:00
Niels Abspoel
4128b61dc7 added pkg/suse specific init files 2013-03-24 23:42:08 +01:00
Thomas S Hatch
1efa639849 Merge pull request #4228 from kmwhite/feature-add_openbsd_startup_scripts 
Adding startup scripts for salt-bootstrap to use on OpenBSD
 2013-03-23 22:22:30 -07:00
Kristofer M White
a878f01221 Adding startup scripts for salt-bootstrap to use on OpenBSD 2013-03-23 23:43:28 -05:00
Clint Savage
a67bace68a update rpm spec to patch release 0.13.3 2013-03-22 16:38:45 -06:00
Thomas S Hatch
1572064fef Merge pull request #4172 from cedwards/PKGBUILD 
updated PKGBUILDs to 0.13.3 release
 2013-03-20 13:00:44 -07:00
Christer Edwards
6ef93b92a9 updated PKGBUILDs to 0.13.3 release 2013-03-20 10:58:44 -06:00
Clint Savage
14198a2371 update rpm spec to 0.13.2 2013-03-20 02:37:52 -06:00
David Boucha
e22f0a83fa Bump windows installer version 0.13.3 2013-03-19 19:51:16 -06:00
Sean Channel
b071254640 do not set paths here 2013-03-16 12:20:51 -07:00
Christer Edwards
35a1cf1f12 fixed sources=() reference to removed rc.d scripts 2013-03-15 11:20:47 -06:00
Christer Edwards
ce8b7b51b6 updated to match stable PKGBUILD 
- removed rc.d scripts
 - minor cleanup
 2013-03-15 11:19:06 -06:00
Christer Edwards
3bcbe9934f updated PKGBUILD to 0.13.2 with minor fixes 
- removed rc.d scripts (master,minion,syndic)
 - s/python-m2crypto/python2-m2crypto/
 2013-03-15 11:13:56 -06:00
David Boucha
b343d4fb13 bump Windows installer version 2013-03-13 10:26:18 -06:00
David Boucha
876af6ea3a Properly add the system arch to installer name 
AMD64
or
X86
 2013-03-10 00:26:13 -07:00
Sean Channel
fee8ddb55e drop exit code overrides 2013-03-06 11:13:08 -08:00
Sean Channel
6d10d09db6 stop redirecting to dev null for issue #3900 2013-03-06 10:46:32 -08:00
Steve Kellock
2d4211a32f Oopsie. Master upstart script should run master; not minion. 2013-03-02 16:02:16 -05:00
David Lindquist
5c044d61ec Make /usr/bin first in path to ensure that system python is used 2013-03-01 13:24:55 -08:00
peter
d2933bf762 Keep salt-minion around under upstart even if it dies (uses respawn). 
Allow respawn to be effective after a SIGTERM
 2013-02-22 14:16:05 -08:00
David Boucha
ea9d6902b4 bump version to 0.13.1 2013-02-17 18:07:04 -07:00
Seth House
9ec2a85277 Merge pull request #43 from kaptk2/develop 
Added the service.d file
 2013-02-13 10:20:38 -08:00
Clint Savage
fe22763da0 update the start / kill order with chkconfig 2013-02-13 11:17:33 -07:00
Andrew Niemantsverdriet
b3b5f100a3 Added the service.d file 2013-02-13 11:11:20 -07:00
Henrik Holmboe
61adf94187 Fix the LSB header 
I got complaints from insserv that the LSB header was not compliant. It was
missing required keywords, which must be there even if they are empty.
 2013-02-13 16:36:15 +01:00
Henrik Holmboe
4fa8e63033 Fix the LSB header 
I got complaints from insserv that the LSB header was not compliant. It was
missing required keywords, which must be there even if they are empty.
 2013-02-13 16:32:49 +01:00
Henrik Holmboe
97335f61f1 Add an init script 
This is a straight adaption of the salt-master init script (plus my recent
patch to it in holmboe/salt@464ca9dd1f).
 2013-02-13 15:43:10 +01:00
Henrik Holmboe
464ca9dd1f Allow alternative executables 
With this commit it is possible to use virtualenv with the init scripts.

For example, I have this in my /etc/default/salt:

```
SALTMASTER=/srv/venvs/venv-1/bin/salt-master
SALTMINION=/srv/venvs/venv-1/bin/salt-minion
SALTSYNDIC=/srv/venvs/venv-1/bin/salt-syndic
SALTAPI=/srv/venvs/venv-1/bin/salt-api
PYTHON=/srv/venvs/venv-1/bin/python
```
 2013-02-13 15:30:13 +01:00
Thomas S Hatch
09d48efc3f update rpm spec version 2013-02-12 11:14:03 -07:00
Thomas S Hatch
2880ee96ce update arch package 2013-02-12 11:14:03 -07:00
David Boucha
065cfc4bf4 Update Windows Salt Installer version to 0.13.0 2013-02-12 11:08:59 -07:00
David Boucha
cf7d6f55ec bump version to 0.12.1 2013-02-10 14:41:41 -07:00
Sean Channel
cd29307a9f do not force rm of conf files 2013-02-09 14:03:01 -08:00
Clint Savage
b76fa41378 Remove patches and update to upstream patch release 0.12.1 2013-02-07 16:36:10 -07:00
Pedro Algarvio
5e44395f5b require-all -> require_all fix. Changed to "Unstable" manifests. 
See for more info http://www.cuddletech.com/blog/pivot/entry.php?id=182
 2013-01-28 18:54:18 +00:00
Pedro Algarvio
731ef71a26 Directory rename and manifest changes to include documentation link plus some formatting. 2013-01-28 18:16:41 +00:00
Pedro Algarvio
e3e8727f98 Add SMF manifest files to be used in SmartOS(At least). 2013-01-27 23:54:49 +00:00
David Lindquist
7cec8e54b6 Fix import typo in rpm build patch 2013-01-25 15:08:31 -08:00
Wendall Cada
9ed9dd07b4 Added unittest support to rpm spec. 2013-01-17 20:08:33 -08:00
Clint Savage
97bb52bd5d fixup salt.spec for 0.12.0 2013-01-17 19:17:18 -07:00
Clint Savage
9bdc993f46 moving to new upstream version 0.12.0 2013-01-16 11:26:34 -07:00
Sean Channel
8148c92190 too many exit codes 2013-01-10 22:49:57 -08:00
David Boucha
be50743e2b Add service dependency 2013-01-04 11:29:58 -07:00
David Boucha
42972a8cb0 Add Windows Installer Package resources. 2013-01-04 08:57:30 -07:00
Sean Channel
324f15bb72 whack-a-mole 2013-01-03 16:03:38 -08:00
Clint Savage
45b2eb1cc8 updated to 0.11.1 for security vulnerability fix 2012-12-20 10:24:41 -07:00
rizumu
df94ce9137 Match Arch's PKGBUILD files with those in the AUR 2012-12-20 10:48:34 +01:00
Clint Savage
5b14ee387d updated rpm spec to upstream release 0.11.0 2012-12-14 10:17:34 -07:00
Clint Savage
a02ad59941 fixup rpm pkg to include my changes. updated change by mchestnut to 0.10.5-2 even though it won't be built 2012-12-14 09:24:29 -07:00
Sean Channel
91ee888042 exit codes workaround 2012-12-13 15:12:01 -08:00
Sean Channel
16532f3e3a undo previous change 2012-12-13 13:09:25 -08:00
Sean Channel
f26fa94769 bump kill timeout from default (5) to 10 2012-12-13 13:03:23 -08:00
Sean Channel
6e462d39e4 update options list per cmd 2012-12-06 16:42:09 -08:00
Sean Channel
01cccf4d54 fix out/color flags 2012-12-06 01:02:26 -08:00
David Boucha
d4ae5ae76a Merge pull request #2812 from Talksum/spec_no_templates 
removing references to config templates in spec file
 2012-12-05 14:53:34 -08:00
Sean Channel
7c87e594da remove deprecated output flags 2012-12-05 14:20:45 -08:00
Mike Chesnut
673b409e07 removing references to config tampltes in spec file 2012-12-05 12:14:06 -08:00
Niels Abspoel
3452e2f2e4 PKGBUILD-git updated: 
reflect changes from commit 0d77329
- conf/master.template -> conf/master
- conf/minion.template -> conf/minion
- updated PKGBUILD to add systemd service files
 2012-12-04 21:56:48 +01:00