Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Aug 22, 2011
@dudemeister dudemeister * some debugging rabbitmq update 532c28a
@dudemeister dudemeister wtf? 14ae55f
@dudemeister dudemeister commmooooon rabbitmq 96050d9
Commits on Aug 23, 2011
@dudemeister dudemeister * rabbitmq update of course needs to handle the pid file stuff too 95ed302
@dudemeister dudemeister * handle dudemeister babushka deps within babushka itself no more aut…
…o updates via git
b9cad95
@dudemeister dudemeister * bugfixing babushka update script 8aee3f8
Commits on Aug 30, 2011
@dudemeister dudemeister * small fix in ree package 4fb8f63
Commits on Aug 31, 2011
@dudemeister dudemeister * include xsendfile on new releases 348ea67
@dudemeister dudemeister * fix syntax d488c98
@dudemeister dudemeister * stop rabbitmq before removing it 1410c98
@dudemeister dudemeister * don't check certificate ... :( 999ac0b
@dudemeister dudemeister * force missing conf installation dc28bea
Commits on Sep 01, 2011
@dudemeister dudemeister * stop app monit before killing rabbitmq 151f654
@dudemeister dudemeister * rabbitmq update c2c13e6
@dudemeister dudemeister * use our custom rabbitmq deb :) 86ee042
Commits on Sep 02, 2011
@dudemeister dudemeister * deploy_key -> license_key 945f66d
Commits on Sep 07, 2011
@dudemeister dudemeister * fix release version confusions 7856e65
@dudemeister dudemeister * these fixes were not done at the right place 37d1eb2
Commits on Oct 07, 2011
@dudemeister dudemeister fix rabbitmq init script stuff aabd032
Commits on Oct 10, 2011
@dudemeister dudemeister Edited rabbitmq.rb via GitHub 8b1a0f4
@dudemeister dudemeister * no need for custom rabbitmq pid stuff anymore 9593ead
@dudemeister dudemeister * bugfix on updating bab packages 6200050
Commits on Oct 13, 2011
Christopher Blum Don't start rabbitmq on boot by system c56fb47
Commits on Oct 19, 2011
Christopher Blum Start rabbitmq after installation dfc4353
Commits on Oct 20, 2011
Christopher Blum Starting rabbitmq in the background. This could work... 674c723
Christopher Blum Add acpid 2e1e9fc
Commits on Dec 14, 2011
Christopher Blum Upgrade node.js 0d47225
Commits on Dec 23, 2011
@dudemeister dudemeister * new setting for proxying and allowing remote ssh-ing 923e16b
@dudemeister dudemeister * add proxy_connect in our apache2 deps b99b72f
Commits on Dec 27, 2011
@dudemeister dudemeister * wip on netatalk (afpd) and cups (printing) eb6f906
Commits on Dec 28, 2011
@dudemeister dudemeister * working on bringing netatalk (afp) to our users 757410a
Commits on Jan 02, 2012
Christopher Blum Add 'protonet' to /etc/hosts (no migration for now) a0277c8
Commits on Jan 03, 2012
@dudemeister dudemeister * fix babushka update script, this is a one time thing f799359
@dudemeister dudemeister * moved to the up.migration step of our migrations f97f69c
Commits on Jan 06, 2012
@dudemeister dudemeister * add latest monit source 26935fc
@dudemeister dudemeister * new monit package, handmade with love e4b0c48
@dudemeister dudemeister * force config 67230c8
@dudemeister dudemeister * move postinstall to after 0f5a673
Christopher Blum Friday night bug hunting the monit migration 97b5fac
Commits on Jan 09, 2012
@dudemeister dudemeister * allow access to monit control interface via /monit 08570f3
@dudemeister dudemeister * new version with some changes, see commits before, the old filename…
… was causing cache errors
99a8fe0
@dudemeister dudemeister * d'oh 9ae6a06
@dudemeister dudemeister * monit running in a proxy path fixes so it uses relative paths e2756d5
Commits on Jan 19, 2012
@dudemeister dudemeister * fix hostname settings eec1965
Commits on Mar 01, 2012
@henningthies henningthies split hosts and hostname dep 2fa2650
@henningthies henningthies fix protonet:hosts dep c261c18
@henningthies henningthies small typo fix in hosts dep 5437855
Commits on Mar 02, 2012
@dudemeister dudemeister * remove unneeded config and change the max, min and timeout settings…
… for passenger
4a07f37
Commits on Mar 20, 2012
Christopher Blum Added clamav ed3a7c3
Commits on Mar 21, 2012
Christopher Blum Another approach on getting the babushka script right eb7576f
@dudemeister dudemeister * deps for websockets via apache fba0010
@dudemeister dudemeister Merge branch 'master' of github.com:dudemeister/babushka-deps 3ee68fa
Commits on Mar 26, 2012
@dudemeister dudemeister * add conntrack dep 1afadcf
Commits on Apr 02, 2012
@henningthies henningthies * remove -f flag (Fully Qualified Domain Name) which causes problems …
…with some vm.
6b4ac08
Commits on Apr 04, 2012
@dudemeister dudemeister * wip on the admin server recipe 3737cea
@dudemeister dudemeister Merge branch 'master' of github.com:dudemeister/babushka-deps 01d9808
@dudemeister dudemeister * add mongodb dep 2b0800d
Commits on Apr 17, 2012
@dudemeister dudemeister * handle mongodb security by only allowing local connection 63a8804
@dudemeister dudemeister * small bugfix in syntax 28e29ae
@dudemeister dudemeister * don't overwrite the whole file when patching mongod.conf 26884f6
Commits on Apr 18, 2012
@dudemeister dudemeister * add node 0.6.6 dep for our admin server 7db7699
Commits on Apr 24, 2012
@dudemeister dudemeister * add monit to admin interface 3d1d366
Commits on May 02, 2012
@dudemeister dudemeister * up max clients apache a130657
Commits on May 07, 2012
@henningthies henningthies add ruby 1.9.3 support 7e32545
Commits on May 08, 2012
@dudemeister dudemeister * fix syntax error bcae4e8
Commits on May 10, 2012
@henningthies henningthies add after callback for rvm dep 8a715a8
Commits on May 11, 2012
@henningthies henningthies fix Array.scan 20670ee
@henningthies henningthies fix sudo ruby dc95635
@henningthies henningthies there is a wrong passenger ruby in apache mod conf a1d8e89
@henningthies henningthies change PassengerRuby 5f4fab6
@henningthies henningthies syntax error in passenger.conf.erb fb265b3
Commits on May 15, 2012
@henningthies henningthies install bunder --pre 07d1347
Commits on May 16, 2012
@henningthies henningthies update reps to fix migrations 793d631
@henningthies henningthies fix passenger dep 0da9686
Commits on May 21, 2012
@henningthies henningthies fix bundler dep for bootstraping script d190b16
@henningthies henningthies fix bundler 06d5fde
Commits on May 24, 2012
@dudemeister dudemeister * adding webdav 59c00e0
Commits on May 25, 2012
@dudemeister dudemeister * mod authz doesn't provide binaries 9a9d7b3
@dudemeister dudemeister * authnz_external needs to be enabled d7c83ae
Commits on Jun 05, 2012
@dudemeister dudemeister * rescue nonexistant bundler 56896e6
@dudemeister dudemeister * bundle installation fix 8f09b29
@dudemeister dudemeister * fix for new babushka version 75105e7
@dudemeister dudemeister * fix sudo and the new babushka version d4ad076
@dudemeister dudemeister * new babushka version reverting changes 5bde07a
@dudemeister dudemeister * new babushka version 840bd08
@dudemeister dudemeister * use apt monit on precise c952278
@dudemeister dudemeister * update and fix passenger gem path and version for cases where rvm i…
…s not available (as in the mgiration)
f2fc9e1
Commits on Jun 06, 2012
@dudemeister dudemeister * correctly catch the error d76db8e
Commits on Jun 11, 2012
@tiff tiff Add python-xattr 97f3411
@tiff tiff Fix xattr dd70bd5
Commits on Jun 12, 2012
@tiff tiff Enable xattr 4dd4586
@tiff tiff Fix xattr receipt 956b08f
Commits on Jun 13, 2012
@dudemeister dudemeister * new passenger version 0f31bf8
@dudemeister dudemeister * passenger gem path fix (?) cb764c3
Commits on Jun 20, 2012
@dudemeister dudemeister * add extrausers dep 9823605
Commits on Jun 27, 2012
@henningthies henningthies compile newer version of netatalk with pam flag 25500f0
@henningthies henningthies change webdav homedir for users 6f42d48
@henningthies henningthies fix "netatalk permissions" 03540f9
Commits on Jul 03, 2012
@dudemeister dudemeister * fix webdav permissions for windows servers 9c9d796
@henningthies henningthies add umask to apache2/envvars to fix webdav permissions 6413bfd
Commits on Jul 04, 2012
@henningthies henningthies fix apache2 umask envvars f0126a6
Commits on Jul 06, 2012
@dudemeister dudemeister * apache2 fixes with udev permission af5eb42
@dudemeister dudemeister * add udev permission fix to webdav setup d807ca6
@dudemeister dudemeister * remove others permission - fix @henning probably did to temporarily…
… fix the problem
9dcd404
Commits on Jul 10, 2012
@henningthies henningthies add uams_dhx_pam to netatalk config e5aed72
@henningthies henningthies fix parameters for append_to_file_with_section 40d813a
Commits on Jul 24, 2012
@danopia danopia Reconfigure /dav to be a simple reverse proxy.
Removed all of the existing auth and DAV lines from apache2's vhost
configurations and added /dav to be a ProxyPass to node's new jsDAV
server at <http://localhost:8124/dav>.
e6bdd87
@henningthies henningthies add "avahi enable reflector" dep to enable bonjour across multiple su…
…bnets
6bda1cb
Commits on Aug 14, 2012
@dudemeister dudemeister * acutally increment the counter e095362
Commits on Sep 07, 2012
@tiff tiff New XSendFilePath b94974b
Commits on Sep 28, 2012
@tiff tiff Add options to ProxyPass directive for a hopefully more stable uplaod…
…/download experience
ab820b6
@dudemeister dudemeister * samba me this! dafebfa
@dudemeister dudemeister * remove unnecessary options from interpolation f297c18
Commits on Sep 30, 2012
@dudemeister dudemeister * add valid users to samba 9924c31
Commits on Oct 12, 2012
@henningthies henningthies add vhost for mobile b4d76ee
@henningthies henningthies add mobile to apacheconf 2c64c9c
Commits on Oct 19, 2012
@dudemeister dudemeister * new version of our tcp proxy (now called vnc proxy) solves our "idl…
…e websocket never close" problem
dba4a54
Commits on Nov 15, 2012
@tiff tiff Add zip 0ddc140
Commits on Dec 05, 2012
@henningthies henningthies update some packages for 12.04 bf74349
@henningthies henningthies fix netatalk.complete 9e45867
Commits on Dec 11, 2012
@henningthies henningthies only change monit autostart in ubuntu 10.04 b7a585f
Commits on Dec 12, 2012
@henningthies henningthies prepare for precise update 56bf781
@henningthies henningthies fix some deps for precise upgrade f1fd65b
@henningthies henningthies fix log output of precise update abf9ee3
@henningthies henningthies redirect logoutput a49a676
Commits on Dec 13, 2012
@henningthies henningthies change do-release-upgrade to run in screen 62a821e
@henningthies henningthies force remove 3a3bbc0
Commits on Dec 14, 2012
@henningthies henningthies some screen magic for precise update 6b0f21e
@henningthies henningthies change trigger file eec0b35
Commits on Jan 07, 2013
@DarkSwoop DarkSwoop add user.email and user.name configs 2e7639f
Commits on Jan 08, 2013
@DarkSwoop DarkSwoop link monit in /usr/sbin when installing monit via apt 780d1f5
Commits on Jan 09, 2013
@DarkSwoop DarkSwoop fix automated precise upgrade. c75b75c
Commits on Jan 10, 2013
@DarkSwoop DarkSwoop first fix for precise UPGRADE 2bec236
@DarkSwoop DarkSwoop let's change the passenger mod configuration for apache eafbb68
Commits on Jan 15, 2013
@DarkSwoop DarkSwoop let's use the managed version of netatalk when using precise 3b85be5
@DarkSwoop DarkSwoop remove all the unnecessary echo command 75fc3dd
@DarkSwoop DarkSwoop we need berkeley db for removing netatalk... f91a8d4
Commits on Jan 16, 2013
@DarkSwoop DarkSwoop Revert "we need berkeley db for removing netatalk..."
This reverts commit f91a8d4.
dc0429a
@DarkSwoop DarkSwoop Revert "remove all the unnecessary echo command"
This reverts commit 75fc3dd.
f733d7a
@DarkSwoop DarkSwoop Revert "let's use the managed version of netatalk when using precise"
This reverts commit 3b85be5.
760de72
@DarkSwoop DarkSwoop let's remove that damn echo again 097831b
@DarkSwoop DarkSwoop let's interpret the passenger file as utf-8 177db12
@DarkSwoop DarkSwoop use the sudo commands instead of the shell commands with sudo. f41c18a
Commits on Jan 17, 2013
@DarkSwoop DarkSwoop let's try something out. We set the LANG-parameters and take a look i…
…f everything works.
8655194
@DarkSwoop DarkSwoop Didn't work. So let's revert that LOCALE stuff. Revert "let's try som…
…ething out. We set the LANG-parameters and take a look if everything works."

This reverts commit 8655194.
09ab581
@DarkSwoop DarkSwoop let's drop the log of the passenger. e329a32
@DarkSwoop DarkSwoop need more output here. 095ad2a
@DarkSwoop DarkSwoop confusing stuff was going on here. selecting the right defaults shoul…
…d help.
58deaa5
@DarkSwoop DarkSwoop add the apache2 permissions fix to the precise upgrade. cc46cf5
Commits on Jan 21, 2013
@DarkSwoop DarkSwoop add up max clients for the new apache configuration to prevent the ap…
…ache from spawning thousands of child processes
d2ce0ad
Commits on Feb 15, 2013
@dudemeister dudemeister * new netatalk version - 3.0.3 allows symlinks \o/ 9232418
Commits on Feb 19, 2013
@dudemeister dudemeister * sorry - deleted entry 29c9025
@dudemeister dudemeister * correct erb file for netatalk edd857d
Commits on Feb 27, 2013
@dudemeister dudemeister * samba should allow symlinks b274f6b
@dudemeister dudemeister * ruby 1.9.3-p374 - passenger 3b71379
Commits on Mar 06, 2013
@DarkSwoop DarkSwoop add more deps for apache2 131c7e5
Commits on Mar 07, 2013
@DarkSwoop DarkSwoop we need the dialog package to install rcconf bb3991d
@DarkSwoop DarkSwoop add the dialog dep af5878f
@DarkSwoop DarkSwoop we use the right packages. ALWAYS a550c7c
@DarkSwoop DarkSwoop we want to use that managed thing
 12a1836
@DarkSwoop DarkSwoop remove that apache with teh force 273b360
Commits on Mar 11, 2013
@leehambley leehambley Remove obsolete file.
This file is no longer used to install the dependencies. The depen-
dencies are installed by `install.sh` in the **releaser** application,

The "installation" is simply copying the repository into the
`~/.babushka/deps/...` directory which should be sufficient.

The other part of this file (resetting the Babushka installation to a
known good Git ref) has also been removed as the Babushka framework
will always be installed from the included tarball.
91a0107
@leehambley leehambley Mark & Comment out Ruby upgrade 7204934
@leehambley leehambley Mark & Comment out Ruby upgrade f6c5ec5
Commits on Mar 12, 2013
@dudemeister dudemeister * missing ruby changes cbfedd6
@dudemeister dudemeister force create mode makes sure that the permissions are set correctly 875eec8
@leehambley leehambley M erge branch 'master' into runit 5431e9c
@dudemeister dudemeister * also set the sticky bits otherwise the permissions won't work corre…
…ctly
5d0ded0
Commits on Mar 13, 2013
@dudemeister dudemeister * libdb5.1 update 1aa6de7
Commits on Mar 14, 2013
@dudemeister dudemeister * also set the sticky bits otherwise the permissions won't work corre…
…ctly
4126ee4
@dudemeister dudemeister * libdb5.1 update 727610f
Commits on Mar 15, 2013
@leehambley leehambley Merge remote-tracking branch 'origin/master' into runit b2377ee
Commits on Mar 19, 2013
@leehambley leehambley Dep to upgrade npm a99a021
@leehambley leehambley Node old versions don't like that syntax ec6b861
@leehambley leehambley Correctly check for NPM version. Better output c2b1558
@leehambley leehambley Revert commits c2b1558, ec6b861 and a99a021 acaaa20
Commits on Mar 27, 2013
@DarkSwoop DarkSwoop add apache configuration for german shepherd 0b05a7c
@DarkSwoop DarkSwoop prepare the node isntallation
Conflicts:
	node.rb
c551029
@DarkSwoop DarkSwoop require nvm for node 0.10.1 installation ca3395f
@DarkSwoop DarkSwoop add the managed version of rabbitmq to the deps 3bf02c9
@DarkSwoop DarkSwoop fix the apache2 no method error bccd14e
@DarkSwoop DarkSwoop and now: the real fix... -.- 3a2739c
@DarkSwoop DarkSwoop we use the rabbitmq-server package 6a16503
Commits on Mar 28, 2013
@DarkSwoop DarkSwoop add necessary dependencies for automatic app deployment b0900f5
@DarkSwoop DarkSwoop automatically add rabbitmq management and admin 62a74bd
@DarkSwoop DarkSwoop run the chmod of rabbitmqadmin as sudo 2ccd9f3
@DarkSwoop DarkSwoop restart rabbitmq after adding the management plugin ca82e8f
@DarkSwoop DarkSwoop let protonet install node js 6a204d1
@DarkSwoop DarkSwoop fix nvm installation and create a default alias for using node 0.10.1 0aff991
@DarkSwoop DarkSwoop finally... i was doing it wrong. 161bf96
@DarkSwoop DarkSwoop -.- a019951
@DarkSwoop DarkSwoop the next run a45281d
Commits on Mar 30, 2013
@dudemeister dudemeister * 8 options to just make sure that the permissions are correct... debcb3a
@dudemeister dudemeister * permission changes - this makes sure that directories are changeabl…
…e by the groups
4e4dd77
Commits on Apr 02, 2013
@DarkSwoop DarkSwoop change the ports e919f82
Commits on Apr 03, 2013
@DarkSwoop DarkSwoop change the ports for the proxies d1ec69f
Commits on Apr 04, 2013
@DarkSwoop DarkSwoop enable websocket proxying f7a0786
@DarkSwoop DarkSwoop add monit remove autostart 8743b58
@DarkSwoop DarkSwoop add stop scripts for rabbitmq 2766a75
Commits on Apr 08, 2013
@DarkSwoop DarkSwoop use the apache2 template to be able to use the apache helpers 66a553e
@DarkSwoop DarkSwoop sometimes an exclamation marks at the right place does the magic e744311
@DarkSwoop DarkSwoop check rabbitmq stop as root 28d1b04
Commits on Apr 09, 2013
@DarkSwoop DarkSwoop don't restart apache2. we want runit to handle this for us. 0d839e9
Commits on Apr 11, 2013
@DarkSwoop DarkSwoop change the ports for apache2 for doing nginx proxying 3d068f5
@DarkSwoop DarkSwoop render the ports.conf to use the new ports 5eba9f0
@DarkSwoop DarkSwoop change the ports for using nginx as proxy 9f104a9
Commits on Apr 19, 2013
@dudemeister dudemeister * 8 options to just make sure that the permissions are correct... ff31bde
@dudemeister dudemeister * permission changes - this makes sure that directories are changeabl…
…e by the groups
ac3d1fa
Commits on Apr 25, 2013
@DarkSwoop DarkSwoop require nvm for node 0.10.1 installation 9697ef3
@DarkSwoop DarkSwoop add the managed version of rabbitmq to the deps 59d68c6
@DarkSwoop DarkSwoop fix the apache2 no method error bc0670e
@DarkSwoop DarkSwoop and now: the real fix... -.- 3326795
@DarkSwoop DarkSwoop we use the rabbitmq-server package f214f4f
@DarkSwoop DarkSwoop add necessary dependencies for automatic app deployment 1e97176
@DarkSwoop DarkSwoop automatically add rabbitmq management and admin 2597a49
@DarkSwoop DarkSwoop run the chmod of rabbitmqadmin as sudo 40c4670
@DarkSwoop DarkSwoop restart rabbitmq after adding the management plugin 12991f3
@DarkSwoop DarkSwoop let protonet install node js 3434b77
@DarkSwoop DarkSwoop fix nvm installation and create a default alias for using node 0.10.1 2530a22
@DarkSwoop DarkSwoop finally... i was doing it wrong. cb08989
@DarkSwoop DarkSwoop -.- 999d179
@DarkSwoop DarkSwoop the next run 0eebbcb
@DarkSwoop DarkSwoop change the ports 6b064df
@DarkSwoop DarkSwoop change the ports for the proxies 5dd53c9
@DarkSwoop DarkSwoop enable websocket proxying d67d9d5
@DarkSwoop DarkSwoop add monit remove autostart 23ba2fa
@DarkSwoop DarkSwoop add stop scripts for rabbitmq 9dc6a34
@DarkSwoop DarkSwoop use the apache2 template to be able to use the apache helpers 40376cc
@DarkSwoop DarkSwoop sometimes an exclamation marks at the right place does the magic 0ff410d
@DarkSwoop DarkSwoop check rabbitmq stop as root a99fda7
@DarkSwoop DarkSwoop don't restart apache2. we want runit to handle this for us. 73bd200
@DarkSwoop DarkSwoop change the ports for apache2 for doing nginx proxying 091d6c0
@DarkSwoop DarkSwoop render the ports.conf to use the new ports 87128fb
@DarkSwoop DarkSwoop change the ports for using nginx as proxy 51a1af7
@leehambley leehambley Merge remote-tracking branch 'origin/german-shepherd-v2' 9a138e6
Commits on May 07, 2013
@DarkSwoop DarkSwoop use v0.10.1 instead of 0.10.1 as version number 0886107
Commits on Jun 03, 2013
@leehambley leehambley This is how you check if apache is running. 3bfd892
@leehambley leehambley More Apache Gymnastics ead1219
Commits on Jun 11, 2013
@leehambley leehambley Remove a bunch of really ill thought out Apache2 control code 4f2b935
@leehambley leehambley Allow Apache2-Prefork-Dev to be installed without starting via apt c87e00e
@leehambley leehambley Apache2 with fewer boot time hacks 0befe40
Commits on Jun 14, 2013
@dudemeister dudemeister * fix wrong policy writing in the apache2-dev modules - I don't think…
… they're necessary here cc @leehambley
e0d886a
@dudemeister dudemeister netatalk update! 347d144
Commits on Jun 17, 2013
@dudemeister dudemeister use smbpasswd instead of tdsam ... 1f49335
@leehambley leehambley Remove policy-rc.d from apache2 deps 3591316
@dudemeister dudemeister * no init style scripts for netatalk 1292885
@leehambley leehambley Tweaks around samba/netatalk 765365a
@leehambley leehambley Do this as root, for safety b40f98a
@leehambley leehambley Safer stop scripts for upstart e0ef534
Commits on Oct 14, 2013
@Salzig Salzig change cups mirror, old is dead 9cf2267