From e0cb0b4f55e0538fb531c9675f3c5a75a64527aa Mon Sep 17 00:00:00 2001 From: Arky Date: Mon, 16 Jul 2018 01:17:39 +0700 Subject: [PATCH 1/2] [Debian 10] Add vars/debian-10 file --- vars/debian-10.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 vars/debian-10.yml diff --git a/vars/debian-10.yml b/vars/debian-10.yml new file mode 100644 index 000000000..b80d9e39f --- /dev/null +++ b/vars/debian-10.yml @@ -0,0 +1,24 @@ +is_debuntu: True +is_debian: True +is_debian_10: True +dns_service: bind9 +dhcp_service: isc-dhcp-server +dns_user: bind +proxy: squid +proxy_user: proxy +apache_service: apache2 +apache_config_dir: apache2/sites-available +apache_user: www-data +apache_log_dir: /var/log/apache2 +smb_service: smbd +nmb_service: nmbd +systemctl_program: /bin/systemctl +mysql_service: mariadb +apache_log: /var/log/apache2/access.log +sshd_service: ssh +php_version: 7.2 +postgresql_version: 10 +systemd_location: /lib/systemd/system +# Upgrade OS's own Calibre to very latest: +calibre_via_debs: True +calibre_via_python: False From a6e8d8e79e0c3befc3a57347afc841634af3d7b6 Mon Sep 17 00:00:00 2001 From: Arky Date: Mon, 16 Jul 2018 01:22:30 +0700 Subject: [PATCH 2/2] [Debian 10]Add case switch for debian-10 Fixes #902 --- scripts/local_facts.fact | 1 + vars/debian-10.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/local_facts.fact b/scripts/local_facts.fact index d08dc9f3a..b83d5305a 100755 --- a/scripts/local_facts.fact +++ b/scripts/local_facts.fact @@ -23,6 +23,7 @@ case $OS_VER in "fedora-22" | \ "debian-8" | \ "debian-9" | \ + "debian-10" | \ "ubuntu-16" | \ "ubuntu-17" | \ "ubuntu-18" | \ diff --git a/vars/debian-10.yml b/vars/debian-10.yml index b80d9e39f..bf4245c86 100644 --- a/vars/debian-10.yml +++ b/vars/debian-10.yml @@ -16,7 +16,7 @@ systemctl_program: /bin/systemctl mysql_service: mariadb apache_log: /var/log/apache2/access.log sshd_service: ssh -php_version: 7.2 +php_version: 7.1 postgresql_version: 10 systemd_location: /lib/systemd/system # Upgrade OS's own Calibre to very latest: