Skip to content

Instantly share code, notes, and snippets.

@tnt

tnt/move_distname.patch

Created April 14, 2015 13:27
Show Gist options
  • Save tnt/c61b3c9de4a37893852b to your computer and use it in GitHub Desktop.
Save tnt/c61b3c9de4a37893852b to your computer and use it in GitHub Desktop.
Download ZIP
Raw
move_distname.patch
diff --git a/firewalld/tasks/main.yml b/firewalld/tasks/main.yml
index 2387387..d045654 100644
--- a/firewalld/tasks/main.yml
+++ b/firewalld/tasks/main.yml
@@ -1,19 +1,19 @@
---
-- name: Enable/disable firewalld - RedHat
+- name: RedHat | Enable/disable firewalld
service:
name: firewalld
enabled: "{{ firewalld_enabled }}"
state: "{{ 'started' if firewalld_enabled else 'stopped' }}"
when: ansible_os_family == "RedHat" and firewalld_enabled is defined
-- name: Check if firewalld is running - RedHat
+- name: RedHat | Check if firewalld is running
command: firewall-cmd --state
register: firewalld_running
changed_when: no
failed_when: no
when: ansible_os_family == "RedHat"
-- name: Configure Ports - RedHat
+- name: RedHat | Configure Ports
firewalld:
immediate: yes
permanent: yes
diff --git a/nginx/server/tasks/RedHat.yml b/nginx/server/tasks/RedHat.yml
index 39d5611..86cbf75 100644
--- a/nginx/server/tasks/RedHat.yml
+++ b/nginx/server/tasks/RedHat.yml
@@ -1,19 +1,19 @@
---
-- name: Install nginx.org repo rpm - RedHat
+- name: RedHat | Install nginx.org repo rpm
yum: name=http://nginx.org/packages/centos/7/noarch/RPMS/nginx-release-centos-7-0.el7.ngx.noarch.rpm
-- name: Install packages - RedHat
+- name: RedHat | Install packages
yum:
pkg: "{{item}}"
update_cache: yes
state: latest
with_items: nginx_package_names
-- name: Reload systemd configs - RedHat
+- name: RedHat | Reload systemd configs
shell: systemctl daemon-reload
changed_when: no
-- name: Enable nginx - RedHat
+- name: RedHat | Enable nginx
service:
name: '{{ nginx_service_name }}'
enabled: yes
diff --git a/nginx/webrick/tasks/main.yml b/nginx/webrick/tasks/main.yml
index aabd2ff..443dfd0 100644
--- a/nginx/webrick/tasks/main.yml
+++ b/nginx/webrick/tasks/main.yml
@@ -1,5 +1,5 @@
---
-- name: Create site directories - RedHat
+- name: RedHat | Create site directories
file:
path: "{{ item }}"
state: directory
diff --git a/postgresql/tasks/Debian.yml b/postgresql/tasks/Debian.yml
index 047731f..3a14192 100644
--- a/postgresql/tasks/Debian.yml
+++ b/postgresql/tasks/Debian.yml
@@ -1,13 +1,13 @@
---
-- name: Add repo key - Debian
+- name: Debian | Add repo key
apt_key:
url: '{{ postgresql_apt_key }}'
-- name: Add repo - Debian
+- name: Debian | Add repo
apt_repository:
repo: '{{ postgresql_apt_repo }}'
-- name: Packages - Debian
+- name: Debian | Packages
apt:
pkg: "{{item}}"
update_cache: yes
diff --git a/postgresql/tasks/RedHat.yml b/postgresql/tasks/RedHat.yml
index aa9973e..7e03941 100644
--- a/postgresql/tasks/RedHat.yml
+++ b/postgresql/tasks/RedHat.yml
@@ -1,29 +1,29 @@
---
-- name: get archive index stat info - RedHat
+- name: RedHat | get archive index stat info
stat:
path: /var/cache/yum/pg-{{ postgresql_version }}.html
register: postgresql_repo_index_result
-- name: get archive index - RedHat
+- name: RedHat | get archive index
shell: curl -sS {{ postgresql_org_archive_dir }} > {{ postgresql_repo_index }}
when: not postgresql_repo_index_result.stat.exists
or postgresql_repo_index_result.stat.mtime + 604800 < (ansible_date_time.epoch | int)
-- name: get current repo rpm filename - RedHat
+- name: RedHat | get current repo rpm filename
shell: grep -oE "pgdg-centos{{ postgresql_org_version }}[^\"]+\.rpm" {{ postgresql_repo_index }} | tail -1
register: postgresql_repo_rpm_filename
changed_when: no
-- name: ensure postgresql.org repo rpm is up-to-date - RedHat
+- name: RedHat | ensure postgresql.org repo rpm is up-to-date
get_url:
url: "{{ postgresql_org_archive_dir }}{{ postgresql_repo_rpm_filename.stdout }}"
dest: "/var/cache/yum/{{ postgresql_repo_rpm_filename.stdout }}"
-- name: Install postgresql.org Redhat repo rpm - RedHat
+- name: RedHat | Install postgresql.org Redhat repo rpm
yum:
name: "/var/cache/yum/{{ postgresql_repo_rpm_filename.stdout }}"
-- name: Install packages - RedHat
+- name: RedHat | Install packages
yum:
pkg: "{{item}}"
update_cache: yes
@@ -32,12 +32,12 @@
- postgresql_packages
- postgresql_python_packages # allow ansible to access postgresql
-- name: Initialize PostgreSQL - RedHat
+- name: RedHat | Initialize PostgreSQL
shell: '/usr/pgsql-{{ postgresql_version }}/bin/postgresql{{ postgresql_org_version }}-setup initdb'
args:
creates: '{{ postgresql_data_path }}/base'
-- name: Ensure PostgreSQL-server is running - RedHat
+- name: RedHat | Ensure PostgreSQL-server is running
service:
name: '{{ postgresql_service }}'
state: started
diff --git a/rails/logrotate/tasks/Debian.yml b/rails/logrotate/tasks/Debian.yml
index 2d259df..7b88cc1 100644
--- a/rails/logrotate/tasks/Debian.yml
+++ b/rails/logrotate/tasks/Debian.yml
@@ -1,5 +1,5 @@
---
-- name: Packages - Debian
+- name: Debian | Packages
apt:
pkg: "{{ item }}"
update_cache: yes
diff --git a/rails/logrotate/tasks/RedHat.yml b/rails/logrotate/tasks/RedHat.yml
index a59bd06..9e11f80 100644
--- a/rails/logrotate/tasks/RedHat.yml
+++ b/rails/logrotate/tasks/RedHat.yml
@@ -1,5 +1,5 @@
---
-- name: Packages - RedHat
+- name: RedHat | Packages
yum:
pkg: "{{item}}"
update_cache: yes
diff --git a/rails/tasks/bundle/tasks/RedHat.yml b/rails/tasks/bundle/tasks/RedHat.yml
index 73e6267..80c4b98 100644
--- a/rails/tasks/bundle/tasks/RedHat.yml
+++ b/rails/tasks/bundle/tasks/RedHat.yml
@@ -1,10 +1,10 @@
---
-- name: Find postgresql config-dir-prefix - RedHat
+- name: RedHat | Find postgresql config-dir-prefix
shell: dirname $(realpath /usr/bin/psql)
register: rails_bundle_pg_config_prefix
changed_when: no
-- name: Set bundle config for postgresql - RedHat
+- name: RedHat | Set bundle config for postgresql
command: >
{{ RUBY_PREFIX }} bundle config build.pg
--with-pg-config={{ rails_bundle_pg_config_prefix.stdout }}/pg_config
diff --git a/ruby/postgresql/tasks/Debian.yml b/ruby/postgresql/tasks/Debian.yml
index 8451178..2193431 100644
--- a/ruby/postgresql/tasks/Debian.yml
+++ b/ruby/postgresql/tasks/Debian.yml
@@ -1,4 +1,4 @@
-- name: Packages - Debian
+- name: Debian | Packages
apt:
pkg: "{{item}}"
update_cache: yes
diff --git a/ruby/postgresql/tasks/RedHat.yml b/ruby/postgresql/tasks/RedHat.yml
index eed85a5..ac89dc1 100644
--- a/ruby/postgresql/tasks/RedHat.yml
+++ b/ruby/postgresql/tasks/RedHat.yml
@@ -1,4 +1,4 @@
-- name: Packages - RedHat
+- name: RedHat | Packages
yum:
pkg: "{{item}}"
update_cache: yes
diff --git a/ruby/sqlite3/tasks/Debian.yml b/ruby/sqlite3/tasks/Debian.yml
index 883e1d7..f4da52d 100644
--- a/ruby/sqlite3/tasks/Debian.yml
+++ b/ruby/sqlite3/tasks/Debian.yml
@@ -1,4 +1,4 @@
-- name: Packages - Debian
+- name: Debian | Packages
apt:
pkg: "{{item}}"
update_cache: yes
diff --git a/ruby/sqlite3/tasks/RedHat.yml b/ruby/sqlite3/tasks/RedHat.yml
index 487ee17..ab06d38 100644
--- a/ruby/sqlite3/tasks/RedHat.yml
+++ b/ruby/sqlite3/tasks/RedHat.yml
@@ -1,4 +1,4 @@
-- name: Packages - RedHat
+- name: RedHat | Packages
yum:
pkg: "{{item}}"
update_cache: yes
diff --git a/selinux/tasks/main.yml b/selinux/tasks/main.yml
index 9d1fec3..b51fc4a 100644
--- a/selinux/tasks/main.yml
+++ b/selinux/tasks/main.yml
@@ -1,4 +1,4 @@
---
-- name: En-/Disabling SELinux - RedHat
+- name: RedHat | En-/Disabling SELinux
selinux: state={{ selinux_state }}
when: ansible_os_family == "RedHat"
diff --git a/webrick/restart/tasks/Debian.yml b/webrick/restart/tasks/Debian.yml
index 4bad2ab..81b0188 100644
--- a/webrick/restart/tasks/Debian.yml
+++ b/webrick/restart/tasks/Debian.yml
@@ -1,5 +1,5 @@
---
-- name: Restart - Debian
+- name: Debian | Restart
shell: >
rm {{ RAILS_APP_RESTART_PATH }} ;
{{ profile }}'restart webrick || start webrick'
diff --git a/webrick/restart/tasks/RedHat.yml b/webrick/restart/tasks/RedHat.yml
index b39bc39..2b75741 100644
--- a/webrick/restart/tasks/RedHat.yml
+++ b/webrick/restart/tasks/RedHat.yml
@@ -1,11 +1,11 @@
---
-- name: Restart - RedHat
+- name: RedHat | Restart
service: name={{ webrick_service_name }} state=restarted
register: rails_webrick_restarted
sudo: yes
sudo_user: root
when: rails_webrick_restart.stat.exists
-- name: Remove RAILS_APP_RESTART_PATH - RedHat
+- name: RedHat | Remove RAILS_APP_RESTART_PATH
command: rm {{ RAILS_APP_RESTART_PATH }}
when: rails_webrick_restarted is defined and rails_webrick_restarted|success
diff --git a/webrick/upstart/tasks/Debian.yml b/webrick/upstart/tasks/Debian.yml
index dfd92b6..0b0417c 100644
--- a/webrick/upstart/tasks/Debian.yml
+++ b/webrick/upstart/tasks/Debian.yml
@@ -1,5 +1,5 @@
---
-- name: upstart script - Debian
+- name: Debian | upstart script
template:
dest: "{{ webrick_upstart_conf }}"
src: upstart.conf.j2
diff --git a/webrick/upstart/tasks/RedHat.yml b/webrick/upstart/tasks/RedHat.yml
index 3fecbfc..b08d286 100644
--- a/webrick/upstart/tasks/RedHat.yml
+++ b/webrick/upstart/tasks/RedHat.yml
@@ -1,10 +1,10 @@
---
-- name: systemd unit - RedHat
+- name: RedHat | systemd unit
template:
dest: "{{ webrick_systemd_unit }}"
src: systemd.service.j2
sudo: yes
-- name: enable start at boot - RedHat
+- name: RedHat | enable start at boot
service: name={{ webrick_service_name }} enabled=yes
sudo: yes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment