Commit Graph

10979 Commits

Author SHA1 Message Date
Thomas S Hatch
f25cb3e46b Add some good functions to walkthrough 2013-02-24 19:31:16 -07:00
Joseph Hall
82f66e13aa Merge pull request #3833 from holmboe/ignore-pycharm
Ignore IntelliJ PyCharm files.
2013-02-24 13:51:51 -08:00
Henrik Holmboe
90befc876c Ignore IntelliJ PyCharm files. 2013-02-24 21:39:08 +01:00
Joseph Hall
8307d382f4 Merge pull request #3831 from igalarzab/ticket-3703
Check MySQL password on mysql.user_present state
2013-02-24 06:25:22 -08:00
Thomas S Hatch
d1aa2a2286 Add notes to walkthrough 2013-02-23 23:01:19 -07:00
Thomas S Hatch
946f87e11e Merge pull request #3830 from tony/pip-editable-local
modules.pip editable to handle use case with local module w/o egg.
2013-02-23 21:51:21 -08:00
Thomas S Hatch
9c037b9720 Merge pull request #3829 from tony/file.directory-makedirs-fix
Make sure makedirs: True accounts for case where a trailing slash exists
2013-02-23 21:49:45 -08:00
Thomas S Hatch
c3ea2fd8e7 Merge pull request #3827 from ealekseev/develop
Fix connections using read_default_file in modules/mysql
2013-02-23 21:48:20 -08:00
Thomas S Hatch
703b39e943 Merge pull request #3826 from hvnsweeting/develop
update document
2013-02-23 21:45:09 -08:00
Thomas S Hatch
3de49b6ab1 Merge pull request #3824 from archtaku/docs
Add notes on true/false, yes/no, on/off
2013-02-23 21:43:58 -08:00
Tony Narlock
c6fc7ebe66 modules.pip editable to handle use case with local module w/o egg. 2013-02-23 19:17:04 -06:00
Sean Channel
5817f888a1 update the package per issue #3710 and issue #3821 2013-02-23 14:37:31 -08:00
Tony Narlock
3fcbfc7219 Make sure makedirs: True accounts for case where a trailing slash exists 2013-02-23 14:50:58 -06:00
Sean Channel
632f6690a8 Pre-Depend on salt-common to fix #3710 2013-02-23 12:26:11 -08:00
Eugene Alekseev
d14c5a27bc In minion config file we can set option 'mysql.default_file' to allow MySQLdb (read_default_file native option) to read file with defaults to use it's data for auth.
But if we do not set option read_default_group for MySQLdb no defaults are really used. So we need explicitly set read_default_group to use defaults file.
In example if we use defaults file
/root/.my.cnf:

 [mysql]
 password=foobarpassword

and in /etc/salt/minion exists:

  mysql.default_file: '/root/.my.cnf'

there will be error if we do not supply password:

foo salt # salt 'testhost' mysql.user_exists user=foobar
testhost:
    Traceback (most recent call last):
      File "/usr/lib64/python2.7/site-packages/salt/minion.py", line 411, in _thread_return
        ret['return'] = func(*args, **kwargs)
      File "/usr/lib64/python2.7/site-packages/salt/modules/mysql.py", line 438, in user_exists
        dbc = _connect()
      File "/usr/lib64/python2.7/site-packages/salt/modules/mysql.py", line 115, in _connect
        dbc = MySQLdb.connect(**connargs)
      File "/usr/lib64/python2.7/site-packages/MySQLdb/__init__.py", line 81, in Connect
        return Connection(*args, **kwargs)
      File "/usr/lib64/python2.7/site-packages/MySQLdb/connections.py", line 187, in __init__
        super(Connection, self).__init__(*args, **kwargs2)
    OperationalError: (1045, "Access denied for user 'root'@'localhost' (using password: NO)")

If /etc/salt/minion contains:
  mysql.default_file: '/root/.my.cnf'
  mysql.default_group: 'mysql'

all will be OK:

foo salt # salt 'testhost' mysql.user_exists user=foobar
testhost:
    False
2013-02-23 19:38:34 +04:00
Jose Ignacio Galarza
0d7e42bba0 Check MySQL password on mysql.user_present state
Check the user MySQL password when the state mysql.user_present is
executed. If a different password is found but the user exists, a
user_chpass command will be raised.
2013-02-23 16:28:57 +01:00
HVN
de6d058d06 update document 2013-02-23 09:44:56 +07: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
Thomas S Hatch
0490ca7852 Start work on the official walkthrough 2013-02-22 14:03:43 -07:00
Erik Johnson
eb1f3a50ca Add notes on true/false, yes/no, on/off 2013-02-22 12:09:32 -08:00
Sean Channel
839bf1528f more for issue #3710 2013-02-22 02:14:54 -08:00
Sean Channel
3339010909 not perfect but better. for issue #3710 2013-02-22 02:09:15 -08:00
Thomas S Hatch
11b7591dd0 Merge pull request #3816 from bclermont/develop
Fix master reference settings documentation
2013-02-21 21:37:04 -08:00
Bruno Clermont
390c5898c4 we're talking about master configuration here.
fix copy-paste from doc/ref/configurations/minion.rst.
2013-02-21 16:15:27 +08:00
Thomas S Hatch
a394170354 Merge pull request #3782 from ydavid365/patch-10
added salt_token filename
2013-02-20 22:53:51 -08:00
Thomas S Hatch
747521179e Merge pull request #3781 from ydavid365/patch-9
typo fix. added example of unrestricted access.
2013-02-20 22:53:24 -08:00
Thomas S Hatch
eaed8e454a Merge pull request #3761 from tony/file.directory.recurse-mode
Recurse mode / chmod permissions for file.directory refs: #3471.
2013-02-20 22:50:40 -08:00
Thomas S Hatch
ba22684efb Merge pull request #3780 from ydavid365/patch-6
extension sp
2013-02-20 22:48:50 -08:00
Thomas S Hatch
11e704664c Merge pull request #3811 from toddejohnson/develop
Change xinetd handling to be more backwards compatible.
2013-02-20 22:48:05 -08:00
Thomas S Hatch
8caa9c56cc Merge pull request #3815 from mrtizmo/develop
Fixes and doc updates.
2013-02-20 22:46:37 -08:00
Colton Myers
652ce9b088 Merge pull request #3804 from jcollie/spelling-fix-1
small spelling fix
2013-02-20 18:34:51 -08:00
Tony Narlock
5a35eae321 file.directory to handle mode / dir_mode. Add file_mode for any
file creation during recurse w/ mode
2013-02-20 20:14:08 -06:00
Nick Davis
e44fd77334 Corrected module name (removed "mod").
Corrected comment when test=True in set_file.
Added example to specify env't for file in set_file.
2013-02-20 19:03:32 -05:00
Tony Narlock
c7404d93d3 Recurse mode / chmod permissions for file.directory refs: #3471. 2013-02-20 17:22:48 -06:00
Todd E Johnson
aae4f16192 Change xinetd handling to be more backwards compatible. 2013-02-20 16:20:09 -06:00
Joseph Hall
34bd9891ce Merge pull request #3810 from aboe76/suse_support_timezone.py
updated timezone.py with osfamily Suse issue #3807 fix
2013-02-20 13:39:30 -08:00
Niels Abspoel
3ed3113a74 updated timezone.py with osfamily Suse
This will fix issue #3806
2013-02-20 22:35:35 +01:00
Joseph Hall
a898e45e97 Merge pull request #3801 from UtahDave/develop
Fix win_service to actually query all Windows Services
2013-02-20 12:44:57 -08:00
Joseph Hall
97663a7f71 Add Jacob Albretson to the AUTHORS file 2013-02-20 18:48:19 +00:00
Colton Myers
001eb064fb Merge pull request #3806 from s0undt3ch/develop
Stop the travis build deps issue
2013-02-20 10:04:20 -08:00
Colton Myers
9847f2e2bc Add Andrew Kuhnhausen to AUTHORS 2013-02-20 10:49:36 -07:00
Pedro Algarvio
84b1a6deed Git should already be installed. 2013-02-20 17:23:18 +00:00
Pedro Algarvio
c4e69cfc46 Ignore missing or broken packages on travis builds. 2013-02-20 17:03:14 +00:00
Colton Myers
4e7e276244 Add myself (Colton Myers) to AUTHORS 2013-02-20 09:32:42 -07:00
Colton Myers
578ae7073e Remove Markus Gattol from AUTHORS 2013-02-20 09:32:34 -07:00
Colton Myers
7df824b607 Change Joseph's e-mail address in AUTHORS 2013-02-20 09:32:23 -07:00
Jeffrey C. Ollie
e94c4916a6 small spelling fix 2013-02-20 09:31:25 -06:00
David Boucha
a0d003d189 update docstring 2013-02-19 23:54:59 -07:00
David Boucha
a136c43c8b Check for key names in case of a misspelling 2013-02-19 23:51:32 -07:00
David Boucha
e227a31425 Add query for service name from Display Name 2013-02-19 23:43:12 -07:00