Permalink
Browse files

use unix line endings

  • Loading branch information...
1 parent bfff2b7 commit 0d773ed60fe25e6e3a724b09289f9236acefa497 @jrobeson jrobeson committed Oct 13, 2012
Showing with 377 additions and 377 deletions.
  1. +30 −30 Readme.md
  2. +106 −106 Vagrantfile
  3. +60 −60 conf/nginx/default
  4. +181 −181 puppet/manifests/default.pp
View
@@ -1,30 +1,30 @@
-Set up a PHP development box super fast
-=======================================
-
-Installation
-------------
-
-* Install vagrant using the installation instructions in the [Getting Started document](http://vagrantup.com/v1/docs/getting-started/index.html)
-* Add a Ubuntu Precise box using the [available official boxes](https://github.com/mitchellh/vagrant/wiki/Available-Vagrant-Boxes), for example: ```vagrant box add phpdevbox http://files.vagrantup.com/precise64.box``` (make sure it's named phpdevbox)
-* Clone this repository
-* Install submodules with ```git submodule update --init```
-* After running ```vagrant up``` the box is set up using Puppet
-* You should now have your working Symfony2 Standard Edition under http://localhost:8181/app_dev.php
-
-Installed components
---------------------
-
-* [Nginx](http://nginx.org) using puppet module (https://github.com/example42/puppet-nginx)
-* [Apache](http://httpd.apache.org/) using puppet module (https://github.com/example42/puppet-apache)
-* [php-fpm](http://php-fpm.org) using puppet module (https://github.com/saz/puppet-php)
-* [git](http://git-scm.com/)
-* [pear](http://pear.php.net/) using puppet module (https://github.com/rafaelfelix/puppet-pear)
-* [Node.js](http://nodejs.org/)
-* [npm](http://npmjs.org/)
-* [less](http://lesscss.org/)
-* [Symfony2 Standard Edition](https://github.com/symfony/symfony-standard)
-* [MySQL](http://dev.mysql.com/downloads/mysql/) using puppet module (https://github.com/example42/puppet-mysql)
-* [MongoDB](http://www.mongodb.org/) using puppet module (https://github.com/puppetlabs/puppetlabs-mongodb)
-* [Capistrano](https://github.com/capistrano/capistrano)
-* [capifony](http://capifony.org/)
-* Most of the [phpqatools](http://www.phpqatools.org) using puppet module (https://github.com/rafaelfelix/puppet-phpqatools)
+Set up a PHP development box super fast
+=======================================
+
+Installation
+------------
+
+* Install vagrant using the installation instructions in the [Getting Started document](http://vagrantup.com/v1/docs/getting-started/index.html)
+* Add a Ubuntu Precise box using the [available official boxes](https://github.com/mitchellh/vagrant/wiki/Available-Vagrant-Boxes), for example: ```vagrant box add phpdevbox http://files.vagrantup.com/precise64.box``` (make sure it's named phpdevbox)
+* Clone this repository
+* Install submodules with ```git submodule update --init```
+* After running ```vagrant up``` the box is set up using Puppet
+* You should now have your working Symfony2 Standard Edition under http://localhost:8181/app_dev.php
+
+Installed components
+--------------------
+
+* [Nginx](http://nginx.org) using puppet module (https://github.com/example42/puppet-nginx)
+* [Apache](http://httpd.apache.org/) using puppet module (https://github.com/example42/puppet-apache)
+* [php-fpm](http://php-fpm.org) using puppet module (https://github.com/saz/puppet-php)
+* [git](http://git-scm.com/)
+* [pear](http://pear.php.net/) using puppet module (https://github.com/rafaelfelix/puppet-pear)
+* [Node.js](http://nodejs.org/)
+* [npm](http://npmjs.org/)
+* [less](http://lesscss.org/)
+* [Symfony2 Standard Edition](https://github.com/symfony/symfony-standard)
+* [MySQL](http://dev.mysql.com/downloads/mysql/) using puppet module (https://github.com/example42/puppet-mysql)
+* [MongoDB](http://www.mongodb.org/) using puppet module (https://github.com/puppetlabs/puppetlabs-mongodb)
+* [Capistrano](https://github.com/capistrano/capistrano)
+* [capifony](http://capifony.org/)
+* Most of the [phpqatools](http://www.phpqatools.org) using puppet module (https://github.com/rafaelfelix/puppet-phpqatools)
View
@@ -1,106 +1,106 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant::Config.run do |config|
- # All Vagrant configuration is done here. The most common configuration
- # options are documented and commented below. For a complete reference,
- # please see the online documentation at vagrantup.com.
-
- # Every Vagrant virtual environment requires a box to build off of.
- config.vm.box = "phpdevbox"
-
- # The url from where the 'config.vm.box' box will be fetched if it
- # doesn't already exist on the user's system.
- # config.vm.box_url = "http://domain.com/path/to/above.box"
-
- # Boot with a GUI so you can see the screen. (Default is headless)
- # config.vm.boot_mode = :gui
-
- # Assign this VM to a host-only network IP, allowing you to access it
- # via the IP. Host-only networks can talk to the host machine as well as
- # any other machines on the same network, but cannot be accessed (through this
- # network interface) by any external networks.
- # config.vm.network :hostonly, "192.168.33.10"
-
- # Assign this VM to a bridged network, allowing you to connect directly to a
- # network using the host's network device. This makes the VM appear as another
- # physical device on your network.
- # config.vm.network :bridged
-
- # Forward a port from the guest to the host, which allows for outside
- # computers to access the VM, whereas host only networking does not.
- config.vm.forward_port 80, 8080 #apache
- config.vm.forward_port 81, 8181 #nginx
- config.vm.forward_port 27017, 27017 #mongodb
- config.vm.forward_port 3306, 3306 #mysql
-
- # Share an additional folder to the guest VM. The first argument is
- # an identifier, the second is the path on the guest to mount the
- # folder, and the third is the path on the host to the actual folder.
- # config.vm.share_folder "v-data", "/vagrant_data", "../data"
-
- # Enable provisioning with Puppet stand alone. Puppet manifests
- # are contained in a directory path relative to this Vagrantfile.
- # You will need to create the manifests directory and a manifest in
- # the file precise64.pp in the manifests_path directory.
- #
- # An example Puppet manifest to provision the message of the day:
- #
- # # group { "puppet":
- # # ensure => "present",
- # # }
- # #
- # # File { owner => 0, group => 0, mode => 0644 }
- # #
- # # file { '/etc/motd':
- # # content => "Welcome to your Vagrant-built virtual machine!
- # # Managed by Puppet.\n"
- # # }
- #
- config.vm.provision :puppet do |puppet|
- puppet.manifests_path = "puppet/manifests"
- puppet.module_path = "puppet/modules"
- puppet.options = ['--verbose']
- end
-
- # Enable provisioning with chef solo, specifying a cookbooks path, roles
- # path, and data_bags path (all relative to this Vagrantfile), and adding
- # some recipes and/or roles.
- #
- # config.vm.provision :chef_solo do |chef|
- # chef.cookbooks_path = "../my-recipes/cookbooks"
- # chef.roles_path = "../my-recipes/roles"
- # chef.data_bags_path = "../my-recipes/data_bags"
- # chef.add_recipe "mysql"
- # chef.add_role "web"
- #
- # # You may also specify custom JSON attributes:
- # chef.json = { :mysql_password => "foo" }
- # end
-
- # Enable provisioning with chef server, specifying the chef server URL,
- # and the path to the validation key (relative to this Vagrantfile).
- #
- # The Opscode Platform uses HTTPS. Substitute your organization for
- # ORGNAME in the URL and validation key.
- #
- # If you have your own Chef Server, use the appropriate URL, which may be
- # HTTP instead of HTTPS depending on your configuration. Also change the
- # validation key to validation.pem.
- #
- # config.vm.provision :chef_client do |chef|
- # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
- # chef.validation_key_path = "ORGNAME-validator.pem"
- # end
- #
- # If you're using the Opscode platform, your validator client is
- # ORGNAME-validator, replacing ORGNAME with your organization name.
- #
- # IF you have your own Chef Server, the default validation client name is
- # chef-validator, unless you changed the configuration.
- #
- # chef.validation_client_name = "ORGNAME-validator"
-
- # allow symlinks in vm
- config.vm.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/v-root", "1"]
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant::Config.run do |config|
+ # All Vagrant configuration is done here. The most common configuration
+ # options are documented and commented below. For a complete reference,
+ # please see the online documentation at vagrantup.com.
+
+ # Every Vagrant virtual environment requires a box to build off of.
+ config.vm.box = "phpdevbox"
+
+ # The url from where the 'config.vm.box' box will be fetched if it
+ # doesn't already exist on the user's system.
+ # config.vm.box_url = "http://domain.com/path/to/above.box"
+
+ # Boot with a GUI so you can see the screen. (Default is headless)
+ # config.vm.boot_mode = :gui
+
+ # Assign this VM to a host-only network IP, allowing you to access it
+ # via the IP. Host-only networks can talk to the host machine as well as
+ # any other machines on the same network, but cannot be accessed (through this
+ # network interface) by any external networks.
+ # config.vm.network :hostonly, "192.168.33.10"
+
+ # Assign this VM to a bridged network, allowing you to connect directly to a
+ # network using the host's network device. This makes the VM appear as another
+ # physical device on your network.
+ # config.vm.network :bridged
+
+ # Forward a port from the guest to the host, which allows for outside
+ # computers to access the VM, whereas host only networking does not.
+ config.vm.forward_port 80, 8080 #apache
+ config.vm.forward_port 81, 8181 #nginx
+ config.vm.forward_port 27017, 27017 #mongodb
+ config.vm.forward_port 3306, 3306 #mysql
+
+ # Share an additional folder to the guest VM. The first argument is
+ # an identifier, the second is the path on the guest to mount the
+ # folder, and the third is the path on the host to the actual folder.
+ # config.vm.share_folder "v-data", "/vagrant_data", "../data"
+
+ # Enable provisioning with Puppet stand alone. Puppet manifests
+ # are contained in a directory path relative to this Vagrantfile.
+ # You will need to create the manifests directory and a manifest in
+ # the file precise64.pp in the manifests_path directory.
+ #
+ # An example Puppet manifest to provision the message of the day:
+ #
+ # # group { "puppet":
+ # # ensure => "present",
+ # # }
+ # #
+ # # File { owner => 0, group => 0, mode => 0644 }
+ # #
+ # # file { '/etc/motd':
+ # # content => "Welcome to your Vagrant-built virtual machine!
+ # # Managed by Puppet.\n"
+ # # }
+ #
+ config.vm.provision :puppet do |puppet|
+ puppet.manifests_path = "puppet/manifests"
+ puppet.module_path = "puppet/modules"
+ puppet.options = ['--verbose']
+ end
+
+ # Enable provisioning with chef solo, specifying a cookbooks path, roles
+ # path, and data_bags path (all relative to this Vagrantfile), and adding
+ # some recipes and/or roles.
+ #
+ # config.vm.provision :chef_solo do |chef|
+ # chef.cookbooks_path = "../my-recipes/cookbooks"
+ # chef.roles_path = "../my-recipes/roles"
+ # chef.data_bags_path = "../my-recipes/data_bags"
+ # chef.add_recipe "mysql"
+ # chef.add_role "web"
+ #
+ # # You may also specify custom JSON attributes:
+ # chef.json = { :mysql_password => "foo" }
+ # end
+
+ # Enable provisioning with chef server, specifying the chef server URL,
+ # and the path to the validation key (relative to this Vagrantfile).
+ #
+ # The Opscode Platform uses HTTPS. Substitute your organization for
+ # ORGNAME in the URL and validation key.
+ #
+ # If you have your own Chef Server, use the appropriate URL, which may be
+ # HTTP instead of HTTPS depending on your configuration. Also change the
+ # validation key to validation.pem.
+ #
+ # config.vm.provision :chef_client do |chef|
+ # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME"
+ # chef.validation_key_path = "ORGNAME-validator.pem"
+ # end
+ #
+ # If you're using the Opscode platform, your validator client is
+ # ORGNAME-validator, replacing ORGNAME with your organization name.
+ #
+ # IF you have your own Chef Server, the default validation client name is
+ # chef-validator, unless you changed the configuration.
+ #
+ # chef.validation_client_name = "ORGNAME-validator"
+
+ # allow symlinks in vm
+ config.vm.customize ["setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/v-root", "1"]
+end
View
@@ -1,60 +1,60 @@
-server {
- listen 81;
- server_name localhost;
- access_log /var/log/nginx/localhost.access.log;
- error_log /var/log/nginx/localhost.error.log error;
-
- # strip app.php/ prefix if it is present
- rewrite ^/app\.php/?(.*)$ /$1 permanent;
-
-## Default location
- location / {
- root /vagrant/www/symfony/web;
- index app.php;
- try_files $uri @rewriteapp;
- }
-
- location @rewriteapp {
- rewrite ^(.*)$ /app.php/$1 last;
- }
-
-## Images and static content is treated different
- location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|xml)$ {
- access_log off;
- expires 30d;
- root /vagrant/www/symfony/web;
- }
-
-## Parse all .php file in the /vagrant/www/symfony/web directory
- location ~ ^/(app|app_dev)\.php(/|$) {
- root /vagrant/www/symfony/web;
- fastcgi_split_path_info ^(.+\.php)(.*)$;
- fastcgi_pass backend;
- fastcgi_index index.php;
- fastcgi_param SCRIPT_FILENAME /vagrant/www/symfony/web$fastcgi_script_name;
- include fastcgi_params;
- fastcgi_param QUERY_STRING $query_string;
- fastcgi_param REQUEST_METHOD $request_method;
- fastcgi_param CONTENT_TYPE $content_type;
- fastcgi_param CONTENT_LENGTH $content_length;
- fastcgi_intercept_errors on;
- fastcgi_ignore_client_abort off;
- fastcgi_connect_timeout 60;
- fastcgi_send_timeout 180;
- fastcgi_read_timeout 180;
- fastcgi_buffer_size 128k;
- fastcgi_buffers 4 256k;
- fastcgi_busy_buffers_size 256k;
- fastcgi_temp_file_write_size 256k;
- }
-
-## Disable viewing .htaccess & .htpassword
- location ~ /\.ht {
- deny all;
- }
-}
-
-## php-fpm backend
-upstream backend {
- server 127.0.0.1:9000;
-}
+server {
+ listen 81;
+ server_name localhost;
+ access_log /var/log/nginx/localhost.access.log;
+ error_log /var/log/nginx/localhost.error.log error;
+
+ # strip app.php/ prefix if it is present
+ rewrite ^/app\.php/?(.*)$ /$1 permanent;
+
+## Default location
+ location / {
+ root /vagrant/www/symfony/web;
+ index app.php;
+ try_files $uri @rewriteapp;
+ }
+
+ location @rewriteapp {
+ rewrite ^(.*)$ /app.php/$1 last;
+ }
+
+## Images and static content is treated different
+ location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|xml)$ {
+ access_log off;
+ expires 30d;
+ root /vagrant/www/symfony/web;
+ }
+
+## Parse all .php file in the /vagrant/www/symfony/web directory
+ location ~ ^/(app|app_dev)\.php(/|$) {
+ root /vagrant/www/symfony/web;
+ fastcgi_split_path_info ^(.+\.php)(.*)$;
+ fastcgi_pass backend;
+ fastcgi_index index.php;
+ fastcgi_param SCRIPT_FILENAME /vagrant/www/symfony/web$fastcgi_script_name;
+ include fastcgi_params;
+ fastcgi_param QUERY_STRING $query_string;
+ fastcgi_param REQUEST_METHOD $request_method;
+ fastcgi_param CONTENT_TYPE $content_type;
+ fastcgi_param CONTENT_LENGTH $content_length;
+ fastcgi_intercept_errors on;
+ fastcgi_ignore_client_abort off;
+ fastcgi_connect_timeout 60;
+ fastcgi_send_timeout 180;
+ fastcgi_read_timeout 180;
+ fastcgi_buffer_size 128k;
+ fastcgi_buffers 4 256k;
+ fastcgi_busy_buffers_size 256k;
+ fastcgi_temp_file_write_size 256k;
+ }
+
+## Disable viewing .htaccess & .htpassword
+ location ~ /\.ht {
+ deny all;
+ }
+}
+
+## php-fpm backend
+upstream backend {
+ server 127.0.0.1:9000;
+}
Oops, something went wrong.

0 comments on commit 0d773ed

Please sign in to comment.