Skip to content

Commit

Permalink
Fix: ansible-galaxy minus to underscore
Browse files Browse the repository at this point in the history
  • Loading branch information
donvipre committed Jul 7, 2018
1 parent 8544e81 commit 695e0f0
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 32 deletions.
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
# TODO: Build better testing for multiple containers and os support
language: python
python:
python:
- "2.7"
- "3.6"

Expand All @@ -12,6 +11,8 @@ addons:
apt:
packages:
- python-pip
- aspell
- aspell-en

install:
# Install ansible
Expand All @@ -22,16 +23,15 @@ install:
# Check ansible version
- ansible --version

# Create ansible.cfg with correct roles_path
- printf '[defaults]\nroles_path=../' >ansible.cfg

# Link github repo to ansible-galaxy name
- ln -s $PWD ../while-true-do.docker-collabora
- ln -s $PWD ../while_true_do.docker-collabora

# Run the tests
script:
- chmod +x tests/test.sh
- tests/test.sh
- chmod +x tests/test-ansible.sh
- tests/test-ansible.sh
- chmod +x tests/test-spelling.sh
- tests/test-spelling.sh

notifications:
webhooks:
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ This role is needed to get the Collabora Online server running as docker contain

## Installation

Install from [Ansible Galaxy](https://galaxy.ansible.com/while-true-do.docker-collabora)
Install from [Ansible Galaxy](https://galaxy.ansible.com/while_true_do.docker-collabora)

```
ansible-galaxy install while-true-do.docker-collabora
ansible-galaxy install while_true_do.docker-collabora
```

Install from [Github](https://github.com/while-true-do/ansible-role-docker-collabora)

```
git clone https://github.com/while-true-do/ansible-role-docker-collabora.git while-true-do.docker-collabora
git clone https://github.com/while-true-do/ansible-role-docker-collabora.git while_true_do.docker-collabora
```

## Requirements
Expand All @@ -42,7 +42,7 @@ wtd_docker_collabora_capabilities: "MKNOD"
## Dependencies
This role depends on <https://galaxy.ansible.com/while-true-do/docker>. You have to install the role:
This role depends on <https://galaxy.ansible.com/while_true_do/docker>. You have to install the role:
```
ansible-galaxy install -r requirements.yml
Expand All @@ -55,7 +55,7 @@ Simple Example:
```yaml
- hosts: servers
roles:
- { role: while-true-do.docker-collabora }
- { role: while_true_do.docker-collabora }
vars:
wtd_docker_collabora_domains: "collabora.example.com"
```
Expand Down
5 changes: 2 additions & 3 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
dependencies:
- while-true-do.docker
- while_true_do.docker

galaxy_info:
author: while-true-do.org
description: A role that runs the Collabora Online server as container using docker.
company: while-true-do.org

issue_tracker_url: https://github.com/while-true-do/ansible-role-docker-collabora/issues
github_branch: master
github_branch: master
license: BSD

min_ansible_version: 2.1
Expand Down
4 changes: 2 additions & 2 deletions requirements.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
# Install while-true-do.docker from galaxy
- src: while-true-do.docker
# Install while_true_do.docker from galaxy
- src: while_true_do.docker
13 changes: 0 additions & 13 deletions tests/test.sh

This file was deleted.

2 changes: 1 addition & 1 deletion tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
- hosts: localhost
remote_user: root
roles:
- while-true-do.docker-collabora
- while_true_do.docker-collabora

0 comments on commit 695e0f0

Please sign in to comment.