From b4efa93bc66b428574be78b2e2eb8edaf6e66434 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 14:46:00 +0100 Subject: [PATCH 01/21] Changed repo --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 7de09bfa..64564a03 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,9 +2,9 @@ # vi: set ft=ruby : # Config Github Settings -github_username = "fideloper" +github_username = "n3r0-ch" github_repo = "Vaprobash" -github_branch = "1.4.1" +github_branch = "master" github_url = "https://raw.githubusercontent.com/#{github_username}/#{github_repo}/#{github_branch}" # Because this:https://developer.github.com/changes/2014-12-08-removing-authorizations-token/ From a6dd7e39b1f88162d1c0e1df257f1a62dc4bff8c Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 14:47:49 +0100 Subject: [PATCH 02/21] Added docker-compose --- Vagrantfile | 3 +++ scripts/docker-compose.sh | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 scripts/docker-compose.sh diff --git a/Vagrantfile b/Vagrantfile index 64564a03..0451c479 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -205,6 +205,9 @@ Vagrant.configure("2") do |config| # Provision Docker # config.vm.provision "shell", path: "#{github_url}/scripts/docker.sh", args: "permissions" + # Provision docker-compose + # config.vm.provision "shell", path: "#{github_url}/scripts/docker-compose.sh" + #### # Web Servers ########## diff --git a/scripts/docker-compose.sh b/scripts/docker-compose.sh new file mode 100644 index 00000000..d00995d6 --- /dev/null +++ b/scripts/docker-compose.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +echo ">>> Installing docker-compose" + +#Install docker-compose +curl -L https://github.com/docker/compose/releases/download/1.3.3/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose +chmod +x /usr/local/bin/docker-compose From 3eb93fb89fb703d9000d1c7fa4f2261b5c79f063 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 15:02:01 +0100 Subject: [PATCH 03/21] Download docker-compose silently --- scripts/docker-compose.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker-compose.sh b/scripts/docker-compose.sh index d00995d6..7f11bbad 100644 --- a/scripts/docker-compose.sh +++ b/scripts/docker-compose.sh @@ -3,5 +3,5 @@ echo ">>> Installing docker-compose" #Install docker-compose -curl -L https://github.com/docker/compose/releases/download/1.3.3/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose +curl -L -s https://github.com/docker/compose/releases/download/1.3.3/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose From daf2ca114c70c7a47fb09b2d5fdf7d67315e74f8 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 15:06:04 +0100 Subject: [PATCH 04/21] Revert Vagrantfile --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 0451c479..2cf2b72d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,9 +2,9 @@ # vi: set ft=ruby : # Config Github Settings -github_username = "n3r0-ch" +github_username = "fideloper" github_repo = "Vaprobash" -github_branch = "master" +github_branch = "1.4.1" github_url = "https://raw.githubusercontent.com/#{github_username}/#{github_repo}/#{github_branch}" # Because this:https://developer.github.com/changes/2014-12-08-removing-authorizations-token/ From 1268a5275d64b3d13527f9b11d69090346ff7c59 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 15:32:52 +0100 Subject: [PATCH 05/21] Added Oracle Java 8 --- Vagrantfile | 3 +++ scripts/oracle-java.sh | 9 +++++++++ 2 files changed, 12 insertions(+) create mode 100644 scripts/oracle-java.sh diff --git a/Vagrantfile b/Vagrantfile index 2cf2b72d..d31140c4 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -320,6 +320,9 @@ Vagrant.configure("2") do |config| # Install Go Version Manager (GVM) # config.vm.provision "shell", path: "#{github_url}/scripts/go.sh", privileged: false, args: [go_version] + # Install Oracle Java 8 + # config.vm.provision "shell", path: "#{github_url}/scripts/oracle-java.sh" + #### # Frameworks and Tooling ########## diff --git a/scripts/oracle-java.sh b/scripts/oracle-java.sh new file mode 100644 index 00000000..4593162c --- /dev/null +++ b/scripts/oracle-java.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +echo ">>> Installing Oracle Java 8" + +# Install Oracle Java 8 +add-apt-repository ppa:webupd8team/java +apt-get update +echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections +apt-get install -qq oracle-java8-installer >> /dev/null 2>&1 From 4e9ff0493efbd7b54641563a5313439e0cf979e2 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 15:35:29 +0100 Subject: [PATCH 06/21] Fixed Readme --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index f3a065f6..ea85626f 100644 --- a/readme.md +++ b/readme.md @@ -101,6 +101,7 @@ Here's a quickstart screencast! * Additional Languages * NodeJS via NVM * Ruby via RVM + * Orcale Java 8 * Frameworks / Tooling * Composer * Laravel From 43df4f6dca895043132f558e717a2d1742df0708 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 15:39:06 +0100 Subject: [PATCH 07/21] Added dnsutils and telnet to the basic packages for debugging purposes --- scripts/base.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/base.sh b/scripts/base.sh index 9f94f8ac..d0bd340c 100644 --- a/scripts/base.sh +++ b/scripts/base.sh @@ -21,7 +21,7 @@ sudo apt-get update # Install base packages # -qq implies -y --force-yes -sudo apt-get install -qq curl unzip git-core ack-grep software-properties-common build-essential +sudo apt-get install -qq curl unzip git-core ack-grep software-properties-common build-essential telnet dnsutils echo ">>> Installing *.xip.io self-signed SSL" From 972d530c416b056cb91c0a502245e1d4829a8c8d Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 15:40:52 +0100 Subject: [PATCH 08/21] Added docker-compose to the Readme --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index ea85626f..82f6d213 100644 --- a/readme.md +++ b/readme.md @@ -76,6 +76,7 @@ Here's a quickstart screencast! * PHP MsSQL (ability to connect to SQL Server) * Screen * Docker + * docker-compose * Web Servers * Apache * HHVM From 1820521190bc01970f458a81b9f6661daa65d553 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 16:06:47 +0100 Subject: [PATCH 09/21] Added m4, Maven, Puppet Client, wkhtltopdf --- Vagrantfile | 18 ++++++++++++++++++ readme.md | 4 ++++ scripts/m4.sh | 6 ++++++ scripts/maven.sh | 6 ++++++ scripts/puppet-client.sh | 13 +++++++++++++ scripts/wkhtmltopdf.sh | 9 +++++++++ 6 files changed, 56 insertions(+) create mode 100644 scripts/m4.sh create mode 100644 scripts/maven.sh create mode 100644 scripts/puppet-client.sh create mode 100644 scripts/wkhtmltopdf.sh diff --git a/Vagrantfile b/Vagrantfile index d31140c4..b66cb8b6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -208,6 +208,7 @@ Vagrant.configure("2") do |config| # Provision docker-compose # config.vm.provision "shell", path: "#{github_url}/scripts/docker-compose.sh" + #### # Web Servers ########## @@ -250,6 +251,7 @@ Vagrant.configure("2") do |config| # Provision Neo4J # config.vm.provision "shell", path: "#{github_url}/scripts/neo4j.sh" + #### # Search Servers ########## @@ -307,6 +309,7 @@ Vagrant.configure("2") do |config| # Install RabbitMQ # config.vm.provision "shell", path: "#{github_url}/scripts/rabbitmq.sh", args: [rabbitmq_user, rabbitmq_password] + #### # Additional Languages ########## @@ -323,6 +326,7 @@ Vagrant.configure("2") do |config| # Install Oracle Java 8 # config.vm.provision "shell", path: "#{github_url}/scripts/oracle-java.sh" + #### # Frameworks and Tooling ########## @@ -352,6 +356,19 @@ Vagrant.configure("2") do |config| # Install Android # config.vm.provision "shell", path: "#{github_url}/scripts/android.sh" + # Install Maven + config.vm.provision "shell", path: "#{github_url}/scripts/maven.sh" + + # Install M4 + config.vm.provision "shell", path: "#{github_url}/scripts/m4.sh" + + # Install Puppet Client + config.vm.provision "shell", path: "#{github_url}/scripts/puppet-client.sh" + + # Install wkhtml2pdf + config.vm.provision "shell", path: "#{github_url}/scripts/wkhtmltopdf.sh" + + #### # Local Scripts # Any local scripts you may want to run post-provisioning. @@ -359,4 +376,5 @@ Vagrant.configure("2") do |config| ########## # config.vm.provision "shell", path: "./local-script.sh" + end diff --git a/readme.md b/readme.md index 82f6d213..360a59de 100644 --- a/readme.md +++ b/readme.md @@ -111,6 +111,10 @@ Here's a quickstart screencast! * MailCatcher * Ansible * Android + * Maven + * M4 + * Puppet Client + * wkhtmltopdf ## The Vagrantfile diff --git a/scripts/m4.sh b/scripts/m4.sh new file mode 100644 index 00000000..dd932c3d --- /dev/null +++ b/scripts/m4.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +echo ">>> Installing m4" + +#Install maven +apt-get install -qq m4 diff --git a/scripts/maven.sh b/scripts/maven.sh new file mode 100644 index 00000000..127ce112 --- /dev/null +++ b/scripts/maven.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +echo ">>> Installing Maven" + +# Install maven +apt-get install -qq maven diff --git a/scripts/puppet-client.sh b/scripts/puppet-client.sh new file mode 100644 index 00000000..d0127835 --- /dev/null +++ b/scripts/puppet-client.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +echo ">>> Installing Puppet Client" + +#Add puppetlabs sources +cd ~; wget https://apt.puppetlabs.com/puppetlabs-release-trusty.deb +dpkg -i puppetlabs-release-trusty.deb +apt-get update +rm puppetlabs-release-trusty.deb + +#Install puppet +#Puppet installation returns wrong error code +apt-get -qq install puppet || true diff --git a/scripts/wkhtmltopdf.sh b/scripts/wkhtmltopdf.sh new file mode 100644 index 00000000..a7e4de9e --- /dev/null +++ b/scripts/wkhtmltopdf.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +echo ">>> Installing wkhtmltopdf" + +# Installwkhtmltopdf +apt-get install -qq wkhtmltopdf xvfb +echo 'xvfb-run --server-args="-screen 0, 1024x768x24" /usr/bin/wkhtmltopdf $*' > /usr/bin/wkhtmltopdf.sh +chmod a+rx /usr/bin/wkhtmltopdf.sh +ln -s /usr/bin/wkhtmltopdf.sh /usr/local/bin/wkhtmltopdf From 1c6c3939f3ebf5f3a486382200463b9ba82841a6 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 16:08:30 +0100 Subject: [PATCH 10/21] Uncommented new things --- Vagrantfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index b66cb8b6..8592382f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -357,16 +357,16 @@ Vagrant.configure("2") do |config| # config.vm.provision "shell", path: "#{github_url}/scripts/android.sh" # Install Maven - config.vm.provision "shell", path: "#{github_url}/scripts/maven.sh" + # config.vm.provision "shell", path: "#{github_url}/scripts/maven.sh" # Install M4 - config.vm.provision "shell", path: "#{github_url}/scripts/m4.sh" + # config.vm.provision "shell", path: "#{github_url}/scripts/m4.sh" # Install Puppet Client - config.vm.provision "shell", path: "#{github_url}/scripts/puppet-client.sh" + # config.vm.provision "shell", path: "#{github_url}/scripts/puppet-client.sh" # Install wkhtml2pdf - config.vm.provision "shell", path: "#{github_url}/scripts/wkhtmltopdf.sh" + # config.vm.provision "shell", path: "#{github_url}/scripts/wkhtmltopdf.sh" #### From 782288174c186ad413ce2f09206e1f7280b1508b Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 16:11:33 +0100 Subject: [PATCH 11/21] Allow symlinks inside shared folders --- Vagrantfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 8592382f..9b81c11a 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -141,6 +141,9 @@ Vagrant.configure("2") do |config| # to sleep for instance, then some 3rd party services will reject requests. vb.customize ["guestproperty", "set", :id, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold", 10000] + #Allow symlinks inside shared folders + vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/v-root", "1"] + # Prevent VMs running on Ubuntu to lose internet connection # vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"] # vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"] From 9cbbcc9fafb24570685f3a648cccbd9cb32746ae Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 16:30:28 +0100 Subject: [PATCH 12/21] Warn if the recommended vagrant plugins are not installed --- Vagrantfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 9b81c11a..5270a5fe 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -100,6 +100,8 @@ Vagrant.configure("2") do |config| config.hostmanager.manage_host = true config.hostmanager.ignore_private_ip = false config.hostmanager.include_offline = false + else + warn "The recommeded plugin 'vagrant-hostmanager' is currently not installed. You can install it by executing: 'vagrant plugin install vagrant-hostmanager'" end # Create a hostname, don't forget to put it to the `hosts` file @@ -170,6 +172,8 @@ Vagrant.configure("2") do |config| type: :nfs, mount_options: ['rw', 'vers=3', 'tcp', 'nolock'] } + else + warn "The recommeded plugin 'vagrant-cachier' is currently not installed. You can install it by executing: 'vagrant plugin install vagrant-cachier'" end # Adding vagrant-digitalocean provider - https://github.com/smdahlen/vagrant-digitalocean From 45efb882015b69f1c7c52ac3097d063057e396a5 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 16:40:31 +0100 Subject: [PATCH 13/21] Automatically update the VirtualBox Guest Additions --- Vagrantfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 5270a5fe..056237eb 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -150,6 +150,15 @@ Vagrant.configure("2") do |config| # vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"] # vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"] + # Automatically update VirtualBox Guest Additions + if Vagrant.has_plugin?("vagrant-vbguest") + # set auto_update to false, if you do NOT want to check the correct + # additions version when booting this machine + config.vbguest.auto_update = true + else + warn "The recommeded plugin 'vagrant-vbguest' is currently not installed. You can install it by executing: 'vagrant plugin install vagrant-vbguest'" + end + end # If using VMWare Fusion From 97321ec612f86f9f29293d6a3d11b7045dddde62 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 17:14:13 +0100 Subject: [PATCH 14/21] Added plugin recommendation --- readme.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/readme.md b/readme.md index 360a59de..84361a72 100644 --- a/readme.md +++ b/readme.md @@ -138,6 +138,14 @@ The vagrant file does three things you should take note of: Don't forget to reload your Vagrantfile running `vagrant reload --no-provision`, in case your virtual machine already exists. +## Recommended Plugins + +For an optimal experience we are recommending the installation of the following Vagrant plugins: + +* [vagrant-hostmanager](https://github.com/smdahlen/vagrant-hostmanager) +* [vagrant-cachier](https://github.com/fgrehm/vagrant-cachier) +* [vagrant-vbguest](https://github.com/dotless-de/vagrant-vbguest) (VirtualBox users only) + ## Connecting to MySQL from Sequel Pro: Change your IP address as needed. The default IP address is now `192.168.22.10` From 4f927f600d372765cac66950ab806d9feab3dcc0 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 17:15:09 +0100 Subject: [PATCH 15/21] Added the installation fo the following PHP modules: php5-common, php5-cgi, php5-imap, php5-ldap, php5-json --- scripts/php.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/php.sh b/scripts/php.sh index e72d9416..d6cf425f 100644 --- a/scripts/php.sh +++ b/scripts/php.sh @@ -46,7 +46,7 @@ else # Install PHP # -qq implies -y --force-yes - sudo apt-get install -qq php5-cli php5-fpm php5-mysql php5-pgsql php5-sqlite php5-curl php5-gd php5-gmp php5-mcrypt php5-memcached php5-imagick php5-intl php5-xdebug + sudo apt-get install -qq php5-cli php5-fpm php5-mysql php5-pgsql php5-sqlite php5-curl php5-gd php5-gmp php5-mcrypt php5-memcached php5-imagick php5-intl php5-xdebug php5-common php5-cgi php5-imap php5-ldap php5-json # Set PHP FPM to listen on TCP instead of Socket sudo sed -i "s/listen =.*/listen = 127.0.0.1:9000/" /etc/php5/fpm/pool.d/www.conf From f18b7ee0058338f7f01a8f164a1b82855f61f877 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 17:45:59 +0100 Subject: [PATCH 16/21] Print logo on login --- scripts/base.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/base.sh b/scripts/base.sh index d0bd340c..4cd54e46 100644 --- a/scripts/base.sh +++ b/scripts/base.sh @@ -79,3 +79,16 @@ fi # Enable case sensitivity shopt -u nocasematch + +# Edit MOTD +echo ' +__ __ _ _ +\ \ / / | | | | + \ \ / /_ _ _ __ _ __ ___ | |__ __ _ ___| |__ + \ \/ / _ | _ \| __/ _ \| _ \ / _ / __| _ \ + \ / (_| | |_) | | | (_) | |_) | (_| \__ \ | | | + \/ \__,_| .__/|_| \___/|_.__/ \__,_|___/_| |_| + | | + |_| + +' > /etc/motd From 23fa3f9d14655a4530584887ae448ffcffa1c1df Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 17:53:47 +0100 Subject: [PATCH 17/21] Do not check locales --- scripts/base.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/base.sh b/scripts/base.sh index 4cd54e46..73aebd18 100644 --- a/scripts/base.sh +++ b/scripts/base.sh @@ -5,6 +5,7 @@ echo "Setting Timezone & Locale to $3 & C.UTF-8" sudo ln -sf /usr/share/zoneinfo/$3 /etc/localtime sudo locale-gen C.UTF-8 export LANG=C.UTF-8 +sudo touch /var/lib/cloud/instance/locale-check.skip echo "export LANG=C.UTF-8" >> /home/vagrant/.bashrc From 2e9a0ad0cfd05692104a52770897de4e3989b5a9 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 18:01:47 +0100 Subject: [PATCH 18/21] Set fork repository --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 056237eb..61a606c6 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,9 +2,9 @@ # vi: set ft=ruby : # Config Github Settings -github_username = "fideloper" +github_username = "n3r0-ch" github_repo = "Vaprobash" -github_branch = "1.4.1" +github_branch = "develop" github_url = "https://raw.githubusercontent.com/#{github_username}/#{github_repo}/#{github_branch}" # Because this:https://developer.github.com/changes/2014-12-08-removing-authorizations-token/ From df71df656037cf6c38562fce127312960a793c13 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 18:05:25 +0100 Subject: [PATCH 19/21] Fix typo --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 056237eb..d47f72b5 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -143,7 +143,7 @@ Vagrant.configure("2") do |config| # to sleep for instance, then some 3rd party services will reject requests. vb.customize ["guestproperty", "set", :id, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold", 10000] - #Allow symlinks inside shared folders + # Allow symlinks inside shared folders vb.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/v-root", "1"] # Prevent VMs running on Ubuntu to lose internet connection From 1b87443dd019c220c13502610d162e1882dcd85f Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Sun, 8 Nov 2015 18:30:01 +0100 Subject: [PATCH 20/21] Revert "Do not check locales" This reverts commit 23fa3f9d14655a4530584887ae448ffcffa1c1df. --- scripts/base.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/base.sh b/scripts/base.sh index 73aebd18..4cd54e46 100644 --- a/scripts/base.sh +++ b/scripts/base.sh @@ -5,7 +5,6 @@ echo "Setting Timezone & Locale to $3 & C.UTF-8" sudo ln -sf /usr/share/zoneinfo/$3 /etc/localtime sudo locale-gen C.UTF-8 export LANG=C.UTF-8 -sudo touch /var/lib/cloud/instance/locale-check.skip echo "export LANG=C.UTF-8" >> /home/vagrant/.bashrc From 8eeece7768a00a0be0d9320fbc5087618d956a41 Mon Sep 17 00:00:00 2001 From: Felix Imobersteg Date: Mon, 9 Nov 2015 20:17:56 +0100 Subject: [PATCH 21/21] Use latest wkhtmltopdf version --- scripts/wkhtmltopdf.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/wkhtmltopdf.sh b/scripts/wkhtmltopdf.sh index a7e4de9e..7bab4560 100644 --- a/scripts/wkhtmltopdf.sh +++ b/scripts/wkhtmltopdf.sh @@ -3,7 +3,7 @@ echo ">>> Installing wkhtmltopdf" # Installwkhtmltopdf -apt-get install -qq wkhtmltopdf xvfb -echo 'xvfb-run --server-args="-screen 0, 1024x768x24" /usr/bin/wkhtmltopdf $*' > /usr/bin/wkhtmltopdf.sh -chmod a+rx /usr/bin/wkhtmltopdf.sh -ln -s /usr/bin/wkhtmltopdf.sh /usr/local/bin/wkhtmltopdf +apt-get install -qq wkhtmltopdf xvfb xfonts-75dpi +wget http://download.gna.org/wkhtmltopdf/0.12/0.12.2.1/wkhtmltox-0.12.2.1_linux-trusty-amd64.deb +dpkg -i wkhtmltox-0.12.2.1_linux-trusty-amd64.deb +rm wkhtmltox-0.12.2.1_linux-trusty-amd64.deb