Closes #15 - Implement full support for Ubuntu 16.04 (Xenial) and update the local Vagrant box to use 16.04 as its base image.
This commit is contained in:
parent
bfb368d2a3
commit
db7fcccf67
|
@ -15,6 +15,7 @@ app/models/Proxy/*.php
|
|||
*.apdisk
|
||||
.vagrant
|
||||
.idea
|
||||
/ubuntu-*-console.log
|
||||
|
||||
# Local development files.
|
||||
app/.env
|
||||
|
|
|
@ -6,7 +6,7 @@ VAGRANTFILE_API_VERSION = "2"
|
|||
|
||||
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||
|
||||
config.vm.box = "ubuntu/trusty64"
|
||||
config.vm.box = "ubuntu/xenial64"
|
||||
|
||||
# Support for Parallels provider for Vagrant
|
||||
# See: http://parallels.github.io/vagrant-parallels/docs/
|
||||
|
@ -14,13 +14,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
|||
# v.update_guest_tools = true
|
||||
v.memory = 1024
|
||||
|
||||
override.vm.box = "parallels/ubuntu-14.04"
|
||||
override.vm.box = "parallels/ubuntu-16.04"
|
||||
end
|
||||
|
||||
# Customization for Virtualbox (default provider)
|
||||
config.vm.provider :virtualbox do |vb|
|
||||
vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
|
||||
vb.customize ["modifyvm", :id, "--memory", "1024"]
|
||||
vb.memory = 1024
|
||||
vb.customize [
|
||||
'modifyvm', :id,
|
||||
'--natdnshostresolver1', 'on',
|
||||
]
|
||||
end
|
||||
|
||||
# Disabled for Windows 10 + VirtualBox
|
||||
|
|
|
@ -11,10 +11,12 @@
|
|||
- name: Add repo file
|
||||
template: src=mariadb_ubuntu.list.j2 dest=/etc/apt/sources.list.d/mariadb.list owner=root group=root mode=0644
|
||||
register: mariadb_list
|
||||
when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty'
|
||||
|
||||
- name: Add repo key
|
||||
apt_key: id=1BB943DB url=http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xCBCB082A1BB943DB state=present
|
||||
register: mariadb_key
|
||||
when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty'
|
||||
|
||||
- name: Update apt cache
|
||||
apt: update_cache=yes
|
||||
|
@ -41,6 +43,10 @@
|
|||
# command: "mysqladmin -u root password {{ mysql_root_password }}"
|
||||
# notify: restart mysql
|
||||
|
||||
- name: MySQL Root Account Fix (Ubuntu 16.04)
|
||||
shell: "cat {{ util_base }}/xenial_mysql_fix.sql | mysql"
|
||||
when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial'
|
||||
|
||||
# MySQL Secure Installation
|
||||
- name: Set root Password
|
||||
mysql_user:
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
- name: Add PHP PPA repository
|
||||
become: true
|
||||
apt_repository: repo=ppa:ondrej/php
|
||||
when: ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'trusty'
|
||||
|
||||
- name: Add Phalcon PPA repository
|
||||
become: true
|
||||
|
|
|
@ -1,5 +1,8 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
echo "nameserver 8.8.8.8" | sudo tee /etc/resolv.conf > /dev/null
|
||||
echo "nameserver 8.8.8.8" | sudo tee /etc/resolvconf/resolv.conf.d/base > /dev/null
|
||||
|
||||
# Add Vagrant user to the sudoers group
|
||||
echo 'vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
|
||||
|
||||
|
@ -16,7 +19,7 @@ sudo apt-add-repository ppa:ansible/ansible
|
|||
sudo apt-get update
|
||||
sudo apt-get install -q -y ansible python-mysqldb
|
||||
|
||||
cat > /home/vagrant/.ansible.cfg <<EOF
|
||||
cat > ~/.ansible.cfg <<EOF
|
||||
[defaults]
|
||||
remote_tmp = /vagrant/ansible/tmp
|
||||
log_path = /vagrant/ansible/ansible.log
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
DROP USER 'root'@'localhost';
|
||||
CREATE USER 'root'@'localhost' IDENTIFIED BY '';
|
||||
GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION;
|
||||
FLUSH PRIVILEGES;
|
Loading…
Reference in New Issue