valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
89,592 Commits 24 Branches 182 Tags 341 MiB
60370f5fb6
Commit Graph

90 Commits

Author SHA1 Message Date
rallytime
60370f5fb6
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/proxy/dummy.py
  - salt/states/file.py
  - tests/integration/modules/test_state.py
  - tests/integration/runners/test_runner_returns.py
  - tests/integration/ssh/test_state.py
  - tests/support/parser/__init__.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_file.py
 2018-01-11 16:00:08 -05:00
Johannes Renner
530ddd2d29
Set SHELL environment variable 
When passing a ProxyCommand option to salt-ssh a valid $SHELL is needed to execute the given command.
 2018-01-11 13:37:38 +01:00
Michael Calmer
2b49a206bb older logrotate need su directive 2017-12-07 17:31:48 +01:00
Pablo Suárez Hernández
30b12da58b Enables salt-minion watchdog on init.d script for sysV 2017-06-20 17:28:40 +01:00
Michael Calmer
db295f6f06 special salt-minion.service file for rhel7 2017-06-20 17:28:39 +01:00
Silvio Moioli
22d884f478 Avoid failures on SLES 12 SP2 because of new systemd TaskMax limit (bsc#985112) 2017-06-20 17:28:39 +01:00
Michael Calmer
8c89378b0d Run salt-api as user salt (bsc#990029) 2017-06-20 17:28:38 +01:00
Klaus Kämpf
0cf36b487b Run salt master as dedicated salt user 
* Minion runs always as a root
 2017-06-20 17:13:00 +01:00
Klaus Kämpf
02b6d8ce42 tserong@suse.com -- We don't have python-systemd, so notify can't work 2017-06-20 17:09:14 +01:00
rallytime
9ff2694155 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - pkg/salt-minion.service
  - salt/modules/junos.py
  - salt/modules/localemod.py
  - salt/modules/win_system.py
  - salt/states/junos.py
  - tests/unit/modules/test_localemod.py
  - tests/unit/modules/test_win_powercfg.py
  - tests/unit/states/dockerng_test.py
 2017-05-24 16:32:59 -06:00
Benjamin Drung
33a7f8b2ec Fix typos 
lintian found several spelling errors.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2017-05-24 12:50:29 +02:00
rallytime
e90622bc22 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/dockermod.py
  - salt/modules/file.py
 2017-04-11 15:03:34 -06:00
Matei Albu
ee911a74b4 suse specific changes to salt-api.service 
* run service under user salt
 * change type from notify to simple
 * set SHELL env var. When passing a ProxyCommand option to salt-ssh a valid $SHELL is needed execute the given command
 2017-04-11 09:19:23 +02:00
Thomas Deutschmann
a177d7f0a1
salt-minion.service: Start after salt-master.service 
On systems where you have both services, salt-master and salt-minion,
enabled, you want that salt-minion.service starts after
salt-master.service so that the minion will be able to connect to the
master on first attempt.
 2017-04-03 11:43:00 +02:00
Bo Maryniuk
eb25e2f768 Add a salt-minion service control file 2017-01-18 15:38:53 +01:00
rallytime
efb8a8ddf5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/config/__init__.py
  - salt/minion.py
 2016-12-22 10:39:14 -07:00
Michael Calmer
de6ec05ec0 add try-restart to fix autorestarting on SUSE systems 2016-12-21 10:31:18 +00:00
rallytime
3b56f8bce1 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/event/master_events.rst
 2016-11-07 08:13:57 -07:00
Michael Calmer
1fb2c4dfcf fix status handling in sysv init scripts 2016-11-06 18:49:12 +01:00
rallytime
9220ea0729 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/minion.py
  - salt/modules/mac_brew.py
  - salt/modules/pkgng.py
  - salt/states/apache_module.py
  - salt/states/ini_manage.py
  - salt/states/win_servermanager.py
 2016-06-02 10:13:34 -04:00
Drew Adams
bcd6a1cd77 fix osfamily from Suse to SUSE 2016-05-26 22:08:40 -07:00
rallytime
a5e0141eda Merge branch '2015.8' into '2106.3' 
Conflicts:
  - salt/beacons/__init__.py
  - salt/modules/saltutil.py
  - salt/modules/zypper.py
  - salt/states/grains.py
  - salt/states/pkgrepo.py
  - salt/states/service.py
 2016-05-25 13:44:21 -06:00
Bo Maryniuk
3b12f396b4 Prevent several minion processes on the same machine (#33464) 2016-05-24 07:37:03 -07:00
rallytime
d684d49490 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
 2016-03-28 11:16:22 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
 2016-03-25 11:47:16 -06:00
Justin Findlay
8de84b4251 update suse master service patch 
Fixes #780.
 2016-03-23 16:03:12 -06:00
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
 2016-03-02 13:48:11 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
Denys Havrysh
fbfc3abccf Remove trailing white spaces in files under pkg/ dir 2016-03-01 17:37:18 +02:00
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
 2016-02-12 14:38:50 -07:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
 2016-02-11 22:33:49 -07:00
Benjamin Drung
708f2ff8ea Fix typo reponse -> response 2016-02-04 13:06:04 +01:00
Benjamin Drung
72c4eab6d7 Fix typo propogate -> propagate 2016-02-04 13:04:27 +01:00
Justin Findlay
543f0ca712 doc, conf, pkg: VMWare -> VMware 2016-02-03 14:27:28 -07:00
rallytime
d31b0d1573 Merge branch '2015.8' into develop 2015-11-04 15:40:03 -07:00
Benjamin Drung
89dcb66310 Fix the wrong "allow to do" phrase 
"allow to do" is not a valid English phrase. Either use a gerund (allow
doing) or add a patient/object (allow someone to do).
 2015-11-04 12:15:41 +01:00
Zach Malone
318473d8fe Extra suse init script fix for $? after an echo 2015-10-23 09:58:34 -06:00
Zach Malone
d8767959d6 Removing $? after "echo" for other startup scripts 2015-10-23 09:57:53 -06:00
Niels Abspoel
8d796e6732 update suse spec file to 2015.8.1 2015-10-18 12:24:09 +02:00
Niels Abspoel
0ad617df21 Updated suse spec to 2015.5.1 2015-05-29 20:26:31 +02:00
Colton Myers
e52b5ab2e2 Remove stray >>>>> 2015-05-26 15:51:56 -06:00
Niels Abspoel
3f65631cb6 updated suse spec file to version 2015.5.0 2015-05-16 10:57:46 -06:00
Niels Abspoel
3d9fa5ce1c Updated suse spec file to salt 2014.7 2014-11-19 22:48:12 +01:00
Niels Abspoel
faaeb57759 Updated spec file to 2014.1.13 2014-10-27 22:47:30 +01: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
Chris Rebert
baa4f852df fix typo: Feauture => Feature 2014-08-11 11:00:23 -07: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
Niels Abspoel
5b451d7e2d updated suse spec file for 2014.1.7 2014-07-11 19:50:06 +02: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