Skip to content

Commit

Permalink
Script and variable clean up.
Browse files Browse the repository at this point in the history
- Remove hubot-scripts package (it was breaking startup)
- More defaults cleanup
- Fix contributors page
- Clean up custom scripts - with hubot_custom_scripts == true all scripts in
  files/scripts will be installed as well
  • Loading branch information
brianshumate committed Jul 28, 2016
1 parent 4e17298 commit b570ca0
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 24 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,11 @@
- Remove all scripts which do not have packaged versions
- Remove deprecated hubot-scripts.json functionality and variables
- Update documentation

## v1.7.1

- Remove hubot-scripts package (it was breaking startup)
- More defaults cleanup
- Fix contributors page
- Clean up custom scripts - with hubot_custom_scripts == true all scripts in
files/scripts will be installed as well
4 changes: 2 additions & 2 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
```
________ _____ _ ____ ______ __
/_ __/ // / _ | / |/ / //_/ __/ / /
/ / / _ / __ |/ / ,< _\ \ /_/
/ / / _ / __ |/ / ,< _\ \ /_/
/_/ /_//_/_/ |_/_/|_/_/|_/___/ (_)
`
```

Much thanks to these fine folks for contributing to the role:

Expand Down
19 changes: 9 additions & 10 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ hubot_node_packages:
- hubot-calculator
- hubot-{{ hubot_adapter }}
- hubot-redis-brain
- hubot-scripts
- hubot-xkcd
- hubot-youtube
- lodash
Expand All @@ -110,21 +109,21 @@ hubot_external_scripts:

#############################################################################
#
# hubot_external_git_scripts: A list of additional Hubot scripts to checkout
# from git.
# hubot_custom_scripts: Boolean — Install all scripts from files/scripts
#
#############################################################################
#
# hubot_external_git_scripts:
# - { name: hubot-jenkins-userauth, repo_url: "https://github.com/joestewart/hubot-jenkins-userauth.git" }
#

hubot_custom_scripts: false

#############################################################################
#
# hubot_custom_scripts: A list of custom additional Hubot scripts in the
# files/scripts directory to use.
#
# hubot_external_git_scripts: A list of additional Hubot scripts to
# check out from git repositories
#############################################################################

# hubot_external_git_scripts:
# - { name: hubot-jenkins-userauth, repo_url: "https://github.com/joestewart/hubot-jenkins-userauth.git" }

# EPEL repository URL
epel_repo_url: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm"

Expand Down
12 changes: 1 addition & 11 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
owner: "{{ hubot_admin }}"
mode: "0644"
with_items: hubot_custom_scripts
when: hubot_custom_scripts is defined
when: hubot_custom_scripts == "true"
notify:
- restart hubot
tags:
Expand All @@ -110,16 +110,6 @@
tags:
- hubot_scripts

- name: Install hubot git scripts
become: False
git: "repo={{ item.repo_url }} version={{ item.version | default('master') }} dest={{ hubot_dir }}/scripts/{{ item.name }}"
with_items: hubot_git_scripts
when: hubot_git_scripts is defined
notify:
- restart hubot
tags:
- hubot_scripts

- name: Configure Hubot external scripts
become: True
become_user: root
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.7.0
v1.7.1

0 comments on commit b570ca0

Please sign in to comment.