mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
Merge pull request #514 from holta/master
./iiab-install pre-positions /etc/iiab/config_vars.yml for now (logic reinforced) + exFAT on debuntu
This commit is contained in:
commit
47fce31938
3 changed files with 17 additions and 10 deletions
|
@ -72,7 +72,12 @@ echo "Placed /etc/ansible/facts.d/local_facts.fact into position."
|
|||
STAGE=0
|
||||
if [ ! -f /etc/iiab/iiab.env ]; then
|
||||
mkdir -p /etc/iiab
|
||||
echo "{}" > /etc/iiab/config_vars.yml
|
||||
echo "Ran 'mkdir -p /etc/iiab'"
|
||||
# ./runtags and Admin Console currently require /etc/iiab/config_vars.yml (in future they may be self-sufficient?)
|
||||
if [ ! -f /etc/iiab/config_vars.yml ]; then
|
||||
echo "{}" > /etc/iiab/config_vars.yml
|
||||
echo "Created stub /etc/iiab/config_vars.yml"
|
||||
fi
|
||||
else
|
||||
if [[ `grep STAGE= /etc/iiab/iiab.env` ]]; then
|
||||
source /etc/iiab/iiab.env
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
iiab_stage: '{{ ansible_local.local_facts.stage }}'
|
||||
|
||||
# Networking uses a different file for the rpi
|
||||
- name: Discover if this is running Raspbian -- if so assume it is an RPi
|
||||
- name: Discover if this is running Raspbian -- if so assume it is a RPi
|
||||
set_fact:
|
||||
rpi_model: "rpi"
|
||||
is_rpi: True
|
||||
|
|
|
@ -10,23 +10,23 @@
|
|||
shell: dnf install -y yum
|
||||
when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22 and ansible_machine != "armv7l"
|
||||
|
||||
- name: Get the createrepo program
|
||||
- name: Get the createrepo program (redhat)
|
||||
package: name=createrepo
|
||||
state=present
|
||||
when: is_redhat
|
||||
|
||||
- name: Create local repo
|
||||
- name: Create local repo (redhat)
|
||||
shell: createrepo {{ yum_packages_dir }}
|
||||
when: is_redhat
|
||||
|
||||
- name: Install local repo file
|
||||
- name: Install local repo file (redhat)
|
||||
template: dest=/etc/yum.repos.d/iiab-local.repo
|
||||
src=local.repo
|
||||
owner=root
|
||||
mode=0644
|
||||
when: is_redhat
|
||||
|
||||
- name: Install yum packages
|
||||
- name: Install yum packages (redhat)
|
||||
package: name={{ item }}
|
||||
state=present
|
||||
with_items:
|
||||
|
@ -47,11 +47,11 @@
|
|||
dest: "{{ downloads_dir }}"
|
||||
when: is_debian_9
|
||||
|
||||
- name: Install usbmount for debian-9
|
||||
- name: Install usbmount (debian-9)
|
||||
command: apt install -y {{ downloads_dir }}/usbmount_0.0.14.1_all.deb
|
||||
when: is_debian_9
|
||||
|
||||
- name: Install packages for Debian
|
||||
- name: Install packages (debuntu)
|
||||
package: name={{ item }}
|
||||
state=present
|
||||
with_items:
|
||||
|
@ -107,7 +107,7 @@
|
|||
- python-setuptools
|
||||
- python-virtualenv
|
||||
|
||||
- name: Update common packages (not Debian)
|
||||
- name: Update common packages (redhat)
|
||||
package: name={{ item }}
|
||||
state=latest
|
||||
with_items:
|
||||
|
@ -117,13 +117,15 @@
|
|||
- iptables
|
||||
when: is_redhat
|
||||
|
||||
- name: Update common packages (Debian)
|
||||
- name: Update common packages (debuntu)
|
||||
package: name={{ item }}
|
||||
state=latest
|
||||
with_items:
|
||||
- libc6
|
||||
- bash
|
||||
- iptables
|
||||
- exfat-fuse
|
||||
- exfat-utils
|
||||
when: is_debuntu
|
||||
|
||||
# instructions state to start with a fully updated system before starting, stop using
|
||||
|
|
Loading…
Add table
Reference in a new issue