Commit graph

537 commits

Author SHA1 Message Date
Michael DeHaan
14a9c3ab9e Line in file regexep should match a portion of the line, not the whole line! 2012-09-07 21:03:59 -04:00
Michael DeHaan
5b57011152 Merge pull request #1027 from mcodd/setup_bug_python24
setup not python24 compatible in 0.7
2012-09-08 05:24:09 -07:00
Michael DeHaan
335f136e71 Merge pull request #1023 from lorin/postgres-user-fix
Fix postgresql_user bug
2012-09-08 05:23:29 -07:00
Matt Coddington
c0638842d8 make this python24 compatible 2012-09-07 22:47:03 -04:00
Lorin Hochstein
b3b01bb7a3 Fix postgresql_user bug
If I create a database from scratch and assign permissions by doing:

      - name: ensure database is created
        action: postgresql_db db=$dbname

      - name: ensure django user has access
        action: postgresql_user db=$dbname user=$dbuser priv=ALL password=$dbpassword

Then it fails with the error:

  File "/tmp/ansible-1347048449.32-29998829936529/postgresql_user", line 565, in <module>
    main()
  File "/tmp/ansible-1347048449.32-29998829936529/postgresql_user", line 273, in main
    changed = grant_privileges(cursor, user, privs) or changed
  File "/tmp/ansible-1347048449.32-29998829936529/postgresql_user", line 174, in grant_privileges
    changed = grant_func(cursor, user, name, privilege)\
  File "/tmp/ansible-1347048449.32-29998829936529/postgresql_user", line 132, in grant_database_privilege
    prev_priv = get_database_privileges(cursor, user, db)
  File "/tmp/ansible-1347048449.32-29998829936529/postgresql_user", line 118, in get_database_privileges
    r = re.search('%s=(C?T?c?)/[a-z]+\,?' % user, datacl)
  File "/usr/lib/python2.7/re.py", line 142, in search
    return _compile(pattern, flags).search(string)
TypeError: expected string or buffer

This fix fixes the problem by not executing the regex if the
db query on pg_database returns None.
2012-09-07 16:24:00 -04:00
Seth Vidal
9d88b3eedd add import sys to virt module b/c it needs it if the libvirt python
module is missing
2012-09-07 16:05:42 -04:00
Michael DeHaan
4280e00d56 Merge pull request #1000 from mavimo/patch-1
Add support to removes control param
2012-09-06 17:52:02 -07:00
Michael DeHaan
7ef3e7dccb Merge pull request #1003 from bladypirat/devel
added support for custom port definition for postgresql_* modules
2012-09-06 17:51:35 -07:00
Michael DeHaan
49bef3f6c2 Merge pull request #1005 from dagwieers/cmdline
Add /proc/cmdline information to the default facts
2012-09-06 17:51:19 -07:00
Jan-Piet Mens
b36aa61237 Add support for RSA/DSA SSH host key detection in setup module for OS/X
s/<8spaces>/<4spaces>/g
2012-09-06 20:40:21 +02:00
Dag Wieers
d158218c3f Add /proc/cmdline information to the default facts
The use-case here is that based on information in the /proc/cmdline certain actions can be taken.

A practical example in our case is that we have a play at the end of the provisioning phase that reboots the system. Since we don't want to accidentally reboot a system (or restart the network) on a production machine, having a way to separate an Anaconda post-install (sshd in chroot) with a normal system is a good way to make that distinction.

    ---
    - name: reboot
      hosts: all
      tasks:
      - action: command init 6
        only_if: "not '${ansible_cmdline.BOOT_IMAGE}'.startswith('$')"

A practical problem here is the fact that we cannot simply check whether it is set or empty:

    ---
    - name: reboot
      hosts: all
      tasks:
      - action: command init 6
        only_if: "'${ansible_cmdline.BOOT_IMAGE}'"

If ansible_cmdline was a string, a simple only_if: "'${ansible_cmdline}'.find(' BOOT_IMAGE=')" was an option, but still not very "beautiful" :-/

This implementation uses shlex.split() and uses split(sep, maxsplit=1).
2012-09-06 09:35:33 +02:00
Piotr Kweclich
8360f9f46c added support for custom port definition 2012-09-05 18:18:30 +02:00
Marco Vito Moscaritolo
2dd430d9c0 Add support to removes control param
Execute action only if specified file using param removes exist (execute reverse control of creates).

Some usage eg.:

```yaml
- name: enable apache2 default websites
  action: command /usr/sbin/a2ensite $item
creates=/etc/apache2/sites-enabled/$item
  with_items:
    - default
    - default-ssl

- name: disable apache2 default websites
  action: command /usr/sbin/a2dissite $item
removes=/etc/apache2/sites-enabled/$item
  with_items:
    - default
    - default-ssl
```
2012-09-05 14:06:47 +03:00
Michael DeHaan
eed031cd82 Check for ipv6 2012-09-04 21:22:47 -04:00
Michael DeHaan
aa704a6111 backuplocal => backup_local for API standardization reasons 2012-09-04 19:49:49 -04:00
Michael DeHaan
b97e2a6f5a Merge branch 'backup-common' of https://github.com/dhozac/ansible into devel 2012-09-04 19:45:39 -04:00
Michael DeHaan
c69c3d6e18 Merge pull request #995 from mattupstate/devel
Use `get_bin_path` properly for supervisorctl module
2012-09-04 16:44:22 -07:00
Daniel Hokka Zakrisson
a5d63532d3 Add backup to assemble 2012-09-04 16:04:53 +02:00
Daniel Hokka Zakrisson
2a8b92954f Add backups to lineinfile 2012-09-04 16:04:53 +02:00
Daniel Hokka Zakrisson
dfcb9d3c2d Move backup to module_common 2012-09-04 16:04:53 +02:00
willthames
8b8eae7d82 Allow ~ expansion in chdir argument of command module
This allows the use of ~ in the chdir argument of the command module
I know the later change is absolutely necessary as the first change
was not sufficient. It may be that the first change fixes shell and
the second fixes command.
2012-09-04 14:22:53 +10:00
willthames
d4c4a51866 Subversion dest should allow ~ expansion
Used os.path.expanduser on dest to allow e.g. ~/svn/repo as
a destination
2012-09-04 10:15:13 +10:00
Michael DeHaan
8f220a4f77 Always pipe stderr in the setup module to avoid JSON interference. 2012-09-02 12:34:28 -04:00
Matt Wright
d52f1d969b Use get_bin_path properly 2012-08-31 15:03:26 -04:00
Matt Wright
a092eadbbb Fix supervisorctl module after merge issue 2012-08-31 11:03:14 -04:00
Michael DeHaan
8e02b165f1 chmod +x 2012-08-30 19:43:14 -04:00
Michael DeHaan
b0ac7e07b0 Merge branch 'binpath' of https://github.com/sfromm/ansible into devel
Conflicts:
	library/supervisorctl
2012-08-30 19:24:09 -04:00
Michael DeHaan
a454db5345 Merge pull request #970 from mattupstate/devel
Improve apt_repository and supervisorctl
2012-08-30 16:21:47 -07:00
Michael DeHaan
90f051f818 Merge pull request #971 from sfromm/seboolean
Add seboolean module
2012-08-30 16:10:30 -07:00
Michael DeHaan
092bd8e3da make parameter required 2012-08-30 19:09:02 -04:00
Michael DeHaan
4da4c31dfb Merge pull request #974 from goozbach/add_selinux_module
add selinux module
2012-08-30 16:02:16 -07:00
Derek Carter
2aa760a3fc add selinux module 2012-08-30 15:29:59 -04:00
Stephen Fromm
6742e9c3f4 Add option required=(True|False) to get_bin_path and update modules
Added required as optional argument to get_bin_path(). It defaults to
false.  Updated following modules to use required=True when calling
get_bin_path():  apt_repository, easy_install, group, pip,
supervisorctl, and user.
Also removed _find_supervisorctl() from supervisorctl module and updated
_is_running() to not need it.
2012-08-30 11:01:37 -07:00
Matt Wright
b93df1fc60 Update handling of state changes 2012-08-30 12:37:02 -04:00
Matt Wright
bdfccbfb34 Move conditional that accounts for variances in distros/versions to work when removing and adding. 2012-08-30 12:35:37 -04:00
Stephen Fromm
97c2e58081 Add seboolean module
Will manage values of seboolean on a host.  Options are name (name of
boolean), state (on or off), and persistent (on or off).  Persistent
defaults to no.
2012-08-30 09:33:09 -07:00
Stephen Fromm
e5a635672c Migrate remaining modules to use get_bin_path in module_common.py
* Migraed easy_install, pip, service, setup, and user.
* Updated fail_json message in apt_repository
* Fixed easy_install to not hardcode location of virtualenv in
  /usr/local/bin/.
* Made handling of virtualenv more consistent between easy_install and
  pip.
2012-08-29 20:26:22 -07:00
Stephen Fromm
bdb39058ae Migrate apt_repository, group, and supervisorctl to use module.get_bin_path 2012-08-29 16:24:49 -07:00
Daniel Hokka Zakrisson
ed8e31d618 Add a lineinfile module 2012-08-30 00:07:58 +02:00
Michael DeHaan
d0994cd169 Merge branch 'setup-no-dash-facts' of https://github.com/tima/ansible into devel
Conflicts:
	library/setup
2012-08-28 20:29:40 -04:00
Matt Wright
a82928e7dc fix bug in supervisorctl module 2012-08-28 19:21:05 -04:00
Timothy Appnel
8c32aefc80 Replace - with _ in setup module key names to avoid variable access problems reported in #954 2012-08-28 19:02:19 -04:00
Michael DeHaan
f9e9753141 Remove obsolete comment 2012-08-28 07:29:32 -04:00
Michael DeHaan
d7eed66a06 Merge pull request #951 from gottwald/devel-git-sudo-fix
Added cwd to tempdir in git clone method. Fixes usage with sudo.
2012-08-28 04:28:46 -07:00
Ingo Gottwald
30fdd56560 Added cwd to tempdir in git clone method. Fixes usage with sudo. 2012-08-28 11:28:50 +02:00
Tim Bielawa
6b73907811 Change from a module config file to brute force locating the nagios configs so we can find the command file. 2012-08-28 02:16:07 -04:00
Tim Bielawa
98d3e2bfc8 Nagios is executable now 2012-08-27 20:01:06 -04:00
Tim Bielawa
8b8aaa7f76 Fix copying that special character 2012-08-27 11:55:38 -04:00
Tim Bielawa
da2665bcd2 In-line docs. 2012-08-27 11:39:52 -04:00
Tim Bielawa
9829033a8a Now reading from a config file actually works. 2012-08-27 11:30:13 -04:00