Merge the latest version of Puphpet, update README.md with external l…

…inks.
alehkot · Jan 3, 2015 · 34a91e8 · 34a91e8
1 parent 4a2c00f
commit 34a91e8
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -20,58 +20,59 @@ The VM includes the fastest option available to synchronize folders in Windows -
 - It is strongly recommended to reboot the VM after successful provisioning using `vagrant reload`.
 
 ## Included ##
-- Ubuntu 64-bit Precise 14.04
-- Drush 7.0-alpha7
-- Apache 2.2(4) with mod_pagespeed and/or nginx
-- PHP 5.6 with steroids:
-  - XDebug
-  - XHProf
-  - SOAP
-  - Uploadprogress
-  - APCu
-  - Memcached
-  - PHP_CodeSniffer
+- [Ubuntu 64-bit Precise 14.04](http://www.ubuntu.com/)
+- [Drush 7.0-alpha7](http://drush.org/en/master/)
+- [Apache 2.4](http://httpd.apache.org/) or [Nginx](http://nginx.org/)
+- [PHP 5.6](http://php.net/) with extensions:
+  - _(debugger, pecl)_ [XDebug](http://xdebug.org/)
+  - _(profiler, tool, pecl)_ [XHProf](https://github.com/phacility/xhprof)
+  - _(pecl)_ [SOAP](http://php.net/manual/en/intro.soap.php)
+  - _(pecl)_ [Uploadprogress](http://pecl.php.net/package/uploadprogress)
+  - _(pecl)_ [APCu](https://github.com/krakjoe/apcu/blob/simplify/INSTALL)
+  - _(pecl)_ [Memcached](http://php.net/manual/en/intro.memcached.php)
+  - _(tool, PEAR)_ [PHP_CodeSniffer](http://pear.php.net/package/PHP_CodeSniffer/redirected)
+  - _(PEAR)_ [PHP_Console_Table](http://pear.php.net/package/Console_Table)
 - Optionally, old versions of PHP are also available with the following extensions:
-	- APC
-	- XCache
-- Apache Solr 4.10.2
-- MySQL 5.5.37
-- dos2unix
+	- _(pecl)_ [APC](http://php.net/manual/en/book.apc.php)
+	- _(pecl)_ [XCache](http://xcache.lighttpd.net/)
+- [Apache Solr 4.10.2](http://lucene.apache.org/solr/)
+- [MySQL 5.5.37](http://www.mysql.com/)
+- [dos2unix](http://linuxcommand.org/man_pages/dos2unix1.html)
 - [Percona Toolkit](http://www.percona.com/software/percona-toolkit)
 - [Adminer](http://www.adminer.org/) (or [phpMyAdmin](http://www.phpmyadmin.net/home_page/index.php))
 - [PimpMyLog](http://pimpmylog.com/)
 - [MailCatcher](http://mailcatcher.me/)
-- ImageMagick
-- Webgrind
-- Curl
-- Sendmail
-- Unzip
-- Git
-- RabbitMQ
-- New Relic
-- Graphviz
-- Vsftpd
-- MC
-- Vim
-- Samba Server
-- Memcached
-- Ruby 1.9.3 using RVM with gems:
-  - Sass
-  - Compass
-  - Bundler
-  - Guard
-  - Guard-livereload
-  - Nodemon
-- node.js with packages:
-    - Yeoman
-    - Bower
-    - Grunt
-    - Gulp
-    - Coffee-script
-    - JSHint
-    - CSSLint
-    - JSLint
-- Python
+- [ImageMagick](http://www.imagemagick.org/)
+- [Webgrind](https://github.com/jokkedk/webgrind)
+- [Curl](http://curl.haxx.se/)
+- [Sendmail](http://www.linuxserverhowto.com/linux-mail-server-sendmail/index.html)
+- [Unzip](http://www.cyberciti.biz/tips/how-can-i-zipping-and-unzipping-files-under-linux.html)
+- [Git](http://git-scm.com/)
+- [RabbitMQ](http://www.rabbitmq.com/) or [Beanstalkd](http://kr.github.io/beanstalkd/)
+- [New Relic](http://newrelic.com/)
+- [Graphviz](http://www.graphviz.org/)
+- [Vsftpd](https://security.appspot.com/vsftpd.html)
+- [MC](http://linux.die.net/man/1/mc)
+- [Vim](http://www.vim.org/)
+- [Samba Server](https://www.samba.org/samba/docs/using_samba/ch02.html)
+- [Memcached](http://memcached.org/)
+- [Ruby 1.9.3](https://www.ruby-lang.org/) using [RVM](https://rvm.io/) with gems:
+  - [Sass](http://sass-lang.com/)
+  - [Compass](http://compass-style.org/)
+  - [Bundler](http://bundler.io/)
+  - [Guard](https://github.com/guard/guard)
+  - [Guard-livereload](https://github.com/guard/guard-livereload)
+- [Node.js](http://nodejs.org/) with packages:
+    - [Yeoman](http://yeoman.io/)
+    - [Bower](http://bower.io/)
+    - [Grunt](http://gruntjs.com/)
+    - [Gulp](http://gulpjs.com/)
+    - [Coffee-script](http://coffeescript.org/)
+    - [JSHint](http://jshint.com/)
+    - [CSSLint](http://csslint.net/)
+    - [ESLint](http://eslint.org/)
+    - [Nodemon](http://nodemon.io/)
+- [Python](https://www.python.org/)
 
 Some of the packages are not enabled by default. You can always adjust installed packages and settings in `puphpet/config.yaml` file.
 

diff --git a/puphpet/config.yaml b/puphpet/config.yaml
@@ -62,6 +62,7 @@ vagrantfile-local:
     vagrant:
         host: detect
 server:
+    install: '1'
     packages:
         - build-essential
         - vim
@@ -83,6 +84,18 @@ server:
         -
             bash_aliases: null
     _prevent_empty: ''
+cron:
+    install: '0'
+    jobs:
+        crlnxelghgl0:
+            monthday: ''
+            name: druphpet
+            user: root
+            command: 'echo "you are using druphpet"'
+            minute: ''
+            hour: '*/10'
+            weekday: ''
+            month: ''    
 firewall:
     install: '1'
     rules:
@@ -132,8 +145,10 @@ nginx:
         default_vhost: 1
         proxy_buffer_size: 128k
         proxy_buffers: '4 256k'
+    upstreams: {  }        
     vhosts:
         VTChGNgY0tNd:
+            proxy: ''
             server_name: druphpet.dev
             server_aliases:
                 - www.druphpet.dev
@@ -147,10 +162,11 @@ nginx:
             envvars:
                 - 'APP_ENV dev'
             engine: php
-            ssl: '1'
-            client_max_body_size: 1m
+            client_max_body_size: 5m
+            ssl: '1'           
             ssl_cert: ''
             ssl_key: ''
+            rewrite_to_https: '1'
             spdy: '1'
 php:
     install: '1'
@@ -275,24 +291,48 @@ postgresql:
         user_group: postgres
         encoding: UTF8
         version: '9.3'
-    databases: {  }
+    databases:
+        ovKmEZcMgJTX:
+            grant: ALL
+            name: druphpet
+            user: druphpet
+            password: ''
+            sql_file: ''
     adminer: '0'
 mariadb:
     install: '0'
     root_password: 'druphpet'
     adminer: '1'
-    databases: {}
+    databases:
+        FpcnrjijrBDO:
+            grant:
+                - ALL
+            name: druphpet
+            host: localhost
+            user: druphpet
+            password: druphpet
+            sql_file: ''
     version: '10.0'
 sqlite:
     install: '0'
     adminer: '0'
-    databases: {  }
+    databases:
+        0nNstbdJm0JB:
+            name: druphpet
+            owner: vagrant
+            group: ''
+            mode: '755'
+            sql_file: ''
 mongodb:
     install: '0'
     settings:
         auth: 1
         port: '27017'
-    databases: {  }
+    databases:
+        zEH4gB9sPFGo:
+            name: druphpet
+            user: druphpet
+            password: druphpet
 redis:
     install: '0'
     settings:

diff --git a/puphpet/puppet/nodes/server.pp b/puphpet/puppet/nodes/server.pp
@@ -30,11 +30,15 @@
   require    => [Group['www-data'], Group['www-user']],
 }
 
-user { ['apache', 'nginx', 'httpd', 'www-data']:
-  shell  => '/bin/bash',
-  ensure => present,
-  groups => 'www-data',
-  require => Group['www-data']
+each( ['apache', 'nginx', 'httpd', 'www-data'] ) |$key| {
+  if ! defined(User[$key]) {
+    user { $key:
+      shell   => '/bin/bash',
+      ensure  => present,
+      groups  => 'www-data',
+      require => Group['www-data']
+    }
+  }
 }
 
 # copy dot files to ssh user's home directory