mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
commit
3597896d71
9 changed files with 29 additions and 31 deletions
|
@ -19,14 +19,9 @@
|
|||
include_tasks: detected_redhat.yml
|
||||
when: is_redhat
|
||||
|
||||
- name: Check to see if dhcpcd is installed and active - Can Fail
|
||||
shell: systemctl is-enabled dhcpcd
|
||||
register: dhcpcd_test
|
||||
ignore_errors: True
|
||||
|
||||
- name: Setting dhcpcd_test results
|
||||
set_fact:
|
||||
dhcpcd_result: "{{ dhcpcd_test.stdout }}"
|
||||
dhcpcd_result: '{{ ansible_local.local_facts.dhcpcd }}'
|
||||
|
||||
- name: Check /etc/network/interfaces for gateway
|
||||
shell: grep {{ device_gw }} /etc/network/interfaces | wc -l
|
||||
|
|
|
@ -44,12 +44,7 @@
|
|||
- name: Initialize the postgres db
|
||||
command: su - postgres -c "/usr/lib/postgresql/{{ postgresql_version }}/bin/initdb -E 'UTF-8' --locale={{ postgresql_locale }} -D /library/pgsql-iiab"
|
||||
creates=/library/pgsql-iiab/pg_hba.conf
|
||||
when: is_debian
|
||||
|
||||
- name: Initialize the postgres db
|
||||
command: su - postgres -c "/usr/lib/postgresql/9.5/bin/initdb -E 'UTF-8' --locale={{ postgresql_locale }} -D /library/pgsql-iiab"
|
||||
creates=/library/pgsql-iiab/pg_hba.conf
|
||||
when: is_ubuntu
|
||||
when: is_debuntu
|
||||
|
||||
- name: Initialize the postgres db
|
||||
command: su - postgres -c "/usr/bin/initdb -E 'UTF-8' --lc-collate={{ postgresql_locale }} --lc-ctype={{ postgresql_locale }} -D /library/pgsql-iiab"
|
||||
|
@ -80,8 +75,8 @@
|
|||
enabled=yes
|
||||
when: postgresql_enabled
|
||||
|
||||
- name: Stop and disable postgresql service if not postgresql_enabled
|
||||
service: name=postgresql
|
||||
- name: Stop and disable postgresql-iiab service if not postgresql_enabled
|
||||
service: name=postgresql-iiab
|
||||
state=stopped
|
||||
enabled=no
|
||||
when: not postgresql_enabled
|
||||
|
|
|
@ -5,6 +5,7 @@ VERSION_ID=`grep VERSION_ID /etc/*elease | cut -d= -f2`
|
|||
VERSION_ID=${VERSION_ID//\"/}
|
||||
VERSION_ID=${VERSION_ID%%.*}
|
||||
OS_VER=$OS-$VERSION_ID
|
||||
DHCPCD=`which dhcpcd`
|
||||
|
||||
case $OS_VER in
|
||||
"fedora-18" | \
|
||||
|
@ -12,6 +13,7 @@ case $OS_VER in
|
|||
"debian-8" | \
|
||||
"debian-9" | \
|
||||
"ubuntu-16" | \
|
||||
"ubuntu-17" | \
|
||||
"centos-7" | \
|
||||
"raspbian-8"| \
|
||||
"raspbian-9")
|
||||
|
@ -45,7 +47,6 @@ fi
|
|||
# interruptions return last stage number recorded (1-9)
|
||||
if [ -f /etc/iiab/iiab.env ]
|
||||
then
|
||||
STAGE=1
|
||||
source /etc/iiab/iiab.env
|
||||
STAGE=$STAGE
|
||||
else
|
||||
|
@ -55,10 +56,11 @@ ANSIBLE_VERSION=$(ansible --version|head -n 1|cut -f 2 -d " ")
|
|||
cat <<EOF
|
||||
{"phplib_dir" : "$PHPLIB_DIR",
|
||||
"stage" : "$STAGE",
|
||||
"dhcpcd" : "$DHCPCD",
|
||||
"iiab_branch" : "$BRANCH",
|
||||
"iiab_commit" : "$COMMIT",
|
||||
"xo_model" : "$XO_VERSION",
|
||||
"ansible_version" : "$ANSIBLE_VERSION",
|
||||
"ansible_version" : "$ANSIBLE_VERSION",
|
||||
"os" : "$OS",
|
||||
"os_ver" : "$OS_VER"}
|
||||
|
||||
|
|
|
@ -14,9 +14,6 @@ nmb_service: nmbd
|
|||
systemctl_program: /bin/systemctl
|
||||
mysql_service: mysql
|
||||
apache_log: /var/log/apache2/access.log
|
||||
# cups lp module not available in raspbian, causes systemd-modueles-load to fail
|
||||
# which in turn cause netfilter-persistent to fail, which is essential
|
||||
cups_install: True
|
||||
sshd_service: ssh
|
||||
php_version: 5
|
||||
postgresql_version: 9.4
|
||||
|
|
|
@ -15,9 +15,6 @@ nmb_service: nmbd
|
|||
systemctl_program: /bin/systemctl
|
||||
mysql_service: mysql
|
||||
apache_log: /var/log/apache2/access.log
|
||||
# cups lp module not available in raspbian, causes systemd-modueles-load to fail
|
||||
# which in turn cause netfilter-persistent to fail, which is essential
|
||||
cups_install: True
|
||||
sshd_service: ssh
|
||||
php_version: 7.0
|
||||
postgresql_version: 9.6
|
||||
|
|
|
@ -16,9 +16,6 @@ nmb_service: nmbd
|
|||
systemctl_program: /bin/systemctl
|
||||
mysql_service: mysql
|
||||
apache_log: /var/log/apache2/access.log
|
||||
# cups lp module not available in raspbian, causes systemd-modueles-load to fail
|
||||
# which in turn cause netfilter-persistent to fail, which is essential
|
||||
cups_install: True
|
||||
sshd_service: ssh
|
||||
php_version: 5
|
||||
postgresql_version: 9.4
|
||||
|
|
|
@ -17,9 +17,6 @@ nmb_service: nmbd
|
|||
systemctl_program: /bin/systemctl
|
||||
mysql_service: mysql
|
||||
apache_log: /var/log/apache2/access.log
|
||||
# cups lp module not available in raspbian, causes systemd-modueles-load to fail
|
||||
# which in turn cause netfilter-persistent to fail, which is essential
|
||||
cups_install: False
|
||||
sshd_service: ssh
|
||||
php_version: 7.0
|
||||
postgresql_version: 9.6
|
||||
|
|
|
@ -14,9 +14,6 @@ nmb_service: nmbd
|
|||
systemctl_program: /bin/systemctl
|
||||
mysql_service: mysql
|
||||
apache_log: /var/log/apache2/access.log
|
||||
# cups lp module not available in raspbian, causes systemd-modueles-load to fail
|
||||
# which in turn cause netfilter-persistent to fail, which is essential
|
||||
cups_install: True
|
||||
sshd_service: ssh
|
||||
php_version: 7.0
|
||||
postgresql_version: 9.5
|
||||
|
|
21
vars/ubuntu-17.yml
Normal file
21
vars/ubuntu-17.yml
Normal file
|
@ -0,0 +1,21 @@
|
|||
is_debuntu: True
|
||||
is_ubuntu: True
|
||||
dns_service: bind9
|
||||
dns_user: bind
|
||||
dhcp_service: isc-dhcp-server
|
||||
proxy: squid
|
||||
proxy_user: proxy
|
||||
apache_service: apache2
|
||||
apache_user: www-data
|
||||
apache_config_dir: apache2/sites-available
|
||||
apache_log_dir: /var/log/apache2
|
||||
smb_service: smbd
|
||||
nmb_service: nmbd
|
||||
systemctl_program: /bin/systemctl
|
||||
# issue raised
|
||||
mysql_service: mysql
|
||||
apache_log: /var/log/apache2/access.log
|
||||
sshd_service: ssh
|
||||
php_version: 7.0
|
||||
postgresql_version: 9.6
|
||||
systemd_location: /lib/systemd/system
|
Loading…
Add table
Add a link
Reference in a new issue