Skip to content

Commit

Permalink
Fixes for better RPM packaging
Browse files Browse the repository at this point in the history
Spec file installs default example hosts files
Spec file marks the contents of /etc/ansible as %config(noreplace)

Example hosts file now with instructional comments
  • Loading branch information
tbielawa committed Mar 10, 2012
1 parent 3f24549 commit dce6074
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 13 deletions.
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
include README.md AUTHORS.md ansible.spec
include examples/hosts
recursive-include docs *
include Makefile
4 changes: 3 additions & 1 deletion ansible.spec
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ make docs
%install
python setup.py install -O1 --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES
mkdir -p $RPM_BUILD_ROOT/etc/ansible/
cp examples/hosts $RPM_BUILD_ROOT/etc/ansible/

%clean
rm -rf $RPM_BUILD_ROOT
Expand All @@ -45,7 +46,8 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%{_bindir}/ansible*
%{_datadir}/ansible/*
%{_sysconfdir}/ansible/
%config(noreplace) %{_sysconfdir}/ansible/


%changelog
* Sat Mar 10 2012 <[email protected]> - 0.0.1-1
Expand Down
12 changes: 0 additions & 12 deletions examples/ansible_hosts

This file was deleted.

37 changes: 37 additions & 0 deletions examples/hosts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This is the default ansible 'hosts' file.
#
# It should live in /etc/ansible/hosts
#
# - Comments begin with the '#' character
# - Blank lines are ignored
# - Groups of hosts are delimited by [header] elements
# - You can enter hostnames or ip addresses
# - A hostname/ip can be a member of multiple groups
#
# Ex 1: Ungrouped hosts, specify before any group headers.
green.bikeshed.org
blue.bikeshed.org
red.bikeshed.org
bikeshed.org
bastion.secure.bikeshed.org
192.168.100.1
192.168.100.10

# Ex 2: A collection of hosts belonging to the 'webservers' group
[webservers]
www01.bikeshed.org
www02.bikeshed.org
wheel.colors.com
192.168.1.100
192.168.1.110
# Your personal website also runs a webserver:
myserver.com

# Ex 3: A collection of database servers in the 'dbservers' group
[dbservers]
db01.intranet.mydomain.net
10.25.1.56
db02.intranet.mydomain.net
10.25.1.57
# Perhaps you serve a db off your personal server too:
myserver.com

0 comments on commit dce6074

Please sign in to comment.