Skip to content

Commit

Permalink
Merge pull request #17 from iqoption/hotfix
Browse files Browse the repository at this point in the history
Added valid gridrouter config dir, Update README.md example section
  • Loading branch information
arslanbekov authored Apr 18, 2018
2 parents 0e874df + 1cf712f commit 11b32dd
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 10 deletions.
19 changes: 10 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ grid_router_host_list: group # Host list for selenoid.xml
grid_router_regions: # Hosts list per region
- name: "region-1"
hosts:
- name: localhost
- name: localhost[01:10].site.com # You can usage pattern [01:N]
port: 4444
browser_count: 5

Expand All @@ -35,12 +35,16 @@ grid_router_browsers: # Browser list usage selenoid
- "59.0"
- "58.0"
- "57.0"
- "56.0"
- "55.0"
- name: "chrome"
defaultVersion: "65.0"
versions:
- "65.0"
- "64.0"
- "63.0"
- "62.0"
- "61.0"
- name: "opera"
defaultVersion: "52.0"
versions:
Expand Down Expand Up @@ -69,8 +73,6 @@ grid_router_browsers:

All supported browsers see [here](https://github.com/aerokube/selenoid#ready-to-use-browser-images).

Ggr is [using](http://aerokube.com/ggr/latest/#_creating_users_file) htpasswd files to store authentication data. Passwords are stored in encrypted form.

#### Example

```yaml
Expand All @@ -84,19 +86,18 @@ Ggr is [using](http://aerokube.com/ggr/latest/#_creating_users_file) htpasswd fi
grid_router_regions:
- name: "region-1"
hosts:
- name: 192.168.1.1
- name: 192.168.1.[1:2]
port: 4444
browser_count: 4
- name: 192.168.1.2
port: 4445
browser_count: 4
grid_router_browsers:
- name: "chrome"
defaultVersion: "62.0"
defaultVersion: "65.0"
versions:
- "62.0"
- "65.0"
- "64.0"
- "63.0"
- "62.0"
roles:
- gridrouter-docker
```
Expand Down
3 changes: 2 additions & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
url: "https://github.com/seleniumkit/sctl/releases/download/{{ grid_router_sctl_version }}/sctl_linux_amd64"
dest: /usr/local/bin/sctl
mode: 0755
force: yes
changed_when: False

- name: Grid Router | Create config dir
Expand Down Expand Up @@ -40,4 +41,4 @@
TZ: "{{ grid_router_time_zone }}"
ports:
- "{{ grid_router_port }}:{{ grid_router_port }}"
command: ["/usr/bin/ggr", "-listen", ":4444", "-quotaDir", "{{ grid_router_qouta_path }}", "-guests-allowed", "-guest-quota", "{{ grid_router_qouta_user }}"]
entrypoint: ["/usr/bin/ggr", "-listen", ":4444", "-quotaDir", "{{ grid_router_qouta_path }}", "-guests-allowed", "-guests-quota", "{{ grid_router_qouta_user }}"]

0 comments on commit 11b32dd

Please sign in to comment.