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.

Sign up for GitHub

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

add release-macstadium-macos10.11-x64-1 #1391

Merged
merged 1 commit into from
Aug 24, 2018
Merged

add release-macstadium-macos10.11-x64-1 #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions ansible/inventory.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ hosts:
- packetnet:
centos7-arm64-1: {ip: 147.75.104.218}

- macstadium:
macos10.11-x64-1: {ip: 207.254.58.162, port: 10013, user: administrator}

- marist:
zos13-s390x-1: {ip: 148.100.36.135, user: Unix1}

Expand Down
8 changes: 8 additions & 0 deletions ansible/roles/baselayout/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
and not os|startswith("macos")
hostname: name="{{ safe_hostname }}"

- name: Set hostname to inventory_hostname macOS
command: "{{ item }}"
with_items:
- "sudo scutil --set HostName {{ inventory_hostname }}.nodejs.org"
- "sudo scutil --set ComputerName {{ inventory_hostname }}.nodejs.org"
- "dscacheutil -flushcache"
when: os|startswith("macos")

- name: disable joyent smartconnect
when: os|startswith("smartos")
notify: restart sshd
Expand Down
9 changes: 8 additions & 1 deletion ansible/roles/java-base/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,14 @@
ignore_errors: yes

- name: install java
when: java.rc > 0 and not os|startswith("zos") and arch != "ppc64" and not inventory_hostname|regex_search('-arm(v6l|v7l|64)_pi')
when:
- java.rc > 0 and not os|startswith("zos") and arch != "ppc64" and not inventory_hostname|regex_search('-arm(v6l|v7l|64)_pi')
- java.rc > 0 and not os|startswith("macos")
package: name="{{ java_package_name }}" state=present

- name: install java (macOS)
become_user: administrator
when: java.rc > 0 and os|startswith("macos")
package: name="{{ java_package_name }}" state=present

- name: install webupd8 oracle java 8 extras
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/package-upgrade/tasks/partials/brew.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
ignore_errors: yes

- name: Install xcode-tools
script: files/partials/install-xcode.sh
script: files/install-xcode.sh
when: xcode.rc > 1

- name: Check if Homebrew is already installed
Expand All @@ -20,7 +20,7 @@

- name: Install Homebrew
become_user: administrator
script: files/partials/install-homebrew.sh
script: files/install-homebrew.sh
when: not brew.stat.exists

- name: Upgrade installed packages
Expand Down