Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xofixes #880

Open
wants to merge 2 commits into
base: release-6.2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions roles/kalite/tasks/install-f18.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
dest={{ downloads_dir }}/ka-lite
depth=1
version="0.13.x"
ignore_errors: yes
when: not {{ use_cache }} and not {{ no_network }} and kalite.stat.exists is defined an not kalite.stat.exists
# ignore_errors: yes
when: not {{ use_cache }} and not {{ no_network }} and kalite.stat.exists is defined and not kalite.stat.exists
tags:
- download2

Expand Down
2 changes: 1 addition & 1 deletion roles/mongodb/templates/mongodb.service
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ User=mongodb
Group=mongodb
PIDFile=/var/run/mongodb/mongod.pid
EnvironmentFile=/etc/sysconfig/mongodb
ExecStart=/usr/bin/mongod $OPTIONS run
ExecStart=/usr/bin/mongod -f /etc/mongod.conf

[Install]
WantedBy=multi-user.target
Expand Down
2 changes: 1 addition & 1 deletion roles/mysql/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
- download

- include: fedora.yml
when: ansible_distribution == "Fedora"
when: ansible_distribution == "Fedora" or ansible_distribution == "OLPC"
tags:
- download

Expand Down
3 changes: 3 additions & 0 deletions roles/network/tasks/avahi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,21 @@
copy: src='/usr/share/doc/{{ avahi_ver.stdout }}/ssh.service'
dest='/etc/avahi/services/'
when: avahi_ver.stdout != "" and not is_debian
ignore_errors: True

- name: Grab a clean copy of ssh.service
copy: src='/usr/share/doc/avahi-daemon/examples/ssh.service'
dest='/etc/avahi/services/'
when: is_debian
ignore_errors: True

- name: set ssh port for avahi
lineinfile: dest=/etc/avahi/services/ssh.service
regexp='</port>$'
line=' <port>{{ssh_port}}</port>'
state=present
backrefs=yes
ignore_errors: True

- name: Enable avahi service
service: name=avahi-daemon
Expand Down
1 change: 1 addition & 0 deletions vars/OLPC.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ systemctl_program: /usr/bin/systemctl
mysql_service: mariadb
apache_log: /var/log/httpd/access_log
apache_log_dir: /var/log/httpd
sshd_service: sshd