Skip to content
This repository has been archived by the owner on Sep 25, 2023. It is now read-only.

Commit

Permalink
[TASK] Move custom Configuration files out of git.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michiel Roos committed Mar 5, 2015
1 parent 09cab40 commit 7c8d485
Show file tree
Hide file tree
Showing 11 changed files with 76 additions and 14 deletions.
Empty file added Configuration/.keep
Empty file.
15 changes: 8 additions & 7 deletions Configuration/vagrant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,19 @@
# homestead box just as if it was a regular remote server. This will be fastest
# because file intensive actions like class inspections etc. will take place on
# the 'native' filesystem instead of over nfs or another 'mounted' filesystem.
synced_folders:
- name: Development
src: ~/Projects/TYPO3/Development
target: /var/www
#synced_folders:
# - name: Development
# src: ~/Projects/TYPO3/Development
# target: /var/www

# IP:
#
# The IP address of local network interface. This defaults to 192.168.144.120
# which happens to be the ip pointed to by *.local.typo3.org. You are advised
# to leave this untouched unless you actually have a network collision.
# private_interface: "192.168.144.120". In this case you will need to take care
# of mapping your own hostname aliasses in the Vagrantfile
# to leave this untouched unless you actually have a network collision. In this
# case you will need to take care of mapping your own hostname aliasses in the
# Vagrantfile
# private_interface: "192.168.144.120"

# Memory:
#
Expand Down
3 changes: 3 additions & 0 deletions Defaults/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---

timezone: Europe/Amsterdam
File renamed without changes.
File renamed without changes.
File renamed without changes.
54 changes: 54 additions & 0 deletions Defaults/vagrant.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
---

# Synced folders:
#
# Host system folders (src) that will be mounted on the guest system (target).
# Homestead installs all sites and sources in the /var/www/ folder. So for ease
# of use we recomend to mount a single host 'Development' folder on /var/www/.
# Linux and OSX users will get the benefit of an NFS mount, but Windows users
# will get the default Vagrant shared folder. SMB may also work fine in the
# future.
#
# But...
# If you want a SUPER fast vm, you can leave this set empty. No folders will be
# shared from host to guest. You will have to set up your ide to access the
# homestead box just as if it was a regular remote server. This will be fastest
# because file intensive actions like class inspections etc. will take place on
# the 'native' filesystem instead of over nfs or another 'mounted' filesystem.
#synced_folders:
# - name: Development
# src: ~/Projects/TYPO3/Development
# target: /var/www

# IP:
#
# The IP address of local network interface. This defaults to 192.168.144.120
# which happens to be the ip pointed to by *.local.typo3.org. You are advised
# to leave this untouched unless you actually have a network collision. In this
# case you will need to take care of mapping your own hostname aliasses in the
# Vagrantfile
# private_interface: "192.168.144.120"

# Memory:
#
# By default 25% of host system memory will be allocated to the guest. But you
# may override that amount by setting a fixed value here. A lower limit of
# 1024 MB is always enforced.
# memory: 2048

# Cores:
#
# By default all cores available on the host system will be used. Please take
# care that specifying more cores than you have available in your host host
# system, may actually 'reduce' performance.
# cores: 2

# Debug:
#
# If debug is enabled, the virtualbox gui will be shown.
# debug: no

# Forward ports:
#
# Should any ports be forwarded to the host system? - generally not needed
# forward_ports: no
File renamed without changes.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ cd TYPO3.Homestead
sudo ansible-galaxy install -r requirements.yml
```

3). Optionally setup a shared directory to hold your TYPO3 sources and sites in the `Configuration/vagrant.yml` file:
3). Copy any configuration files you wish to change from `Defaults/` to `Configuration/`. Optionally setup a shared directory to hold your TYPO3 sources and sites in the `Configuration/vagrant.yml` file:

```yaml
synced_folders:
Expand Down
5 changes: 4 additions & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ require 'yaml'
path = "#{File.dirname(__FILE__)}"

# Get machine configuration
configuration = YAML::load(File.read(path + '/Configuration/vagrant.yml'))
configuration = {}
if File.exist?(path + '/Configuration/vagrant.yml')
configuration = YAML::load(File.read(path + '/Configuration/vagrant.yml')) || {}
end

# Setup defaults
sets = ['synced_folders']
Expand Down
11 changes: 6 additions & 5 deletions site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
gather_facts: true
sudo: yes
vars_files:
- Configuration/main.yml
- Configuration/nginx.yml
- Configuration/php-fpm.yml
- Configuration/websites.yml
- Configuration/typo3.yml
- Defaults/main.yml
- Defaults/nginx.yml
- Defaults/php-fpm.yml
- Defaults/websites.yml
- Defaults/typo3.yml
- [ 'Configuration/main.yml', 'Configuration/nginx.yml', 'Configuration/php-fpm.yml', 'Configuration/websites.yml', 'Configuration/typo3.yml' ]
roles:
- { role: common, tags: common }
- { role: nbz4live.php-fpm, tags: php-fpm }
Expand Down

0 comments on commit 7c8d485

Please sign in to comment.