From e145cbab5b5864c562c6e3019352135be800e7db Mon Sep 17 00:00:00 2001 From: danielvincent Date: Wed, 29 Sep 2010 17:42:56 -0400 Subject: [PATCH 1/6] tar the app's source and throw it in the public folder on server boot. --- public/stylesheets/application.css | 15 +++++++++------ public/stylesheets/sass/application.sass | 14 +++++++++----- script/server | 3 +++ 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 27f5543f1..39427a4f4 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -353,8 +353,14 @@ input[type='text'], textarea { padding: 0.3em; display: block; width: 66%; - border-top: 1px solid #666666; - height: auto; } + border: 1px solid #cccccc; + height: auto; + border-radius: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + box-shadow: 0 1px 2px white; + -moz-box-shadow: 0 1px 2px white; + -webkit-box-shadow: 0 1px 2px white; } #submit_block { text-align: right; @@ -392,10 +398,7 @@ label { width: 600px; height: 42px; margin-top: 0; - margin-bottom: 0; - box-shadow: 0 1px 2px white; - -moz-box-shadow: 0 1px 2px white; - -webkit-box-shadow: 0 1px 2px white; } + margin-bottom: 0; } #publisher .button { margin-left: 100px; } #publisher img { diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index a3873d4c8..225c5ca84 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -474,9 +474,17 @@ input[type='text'], textarea :padding 0.3em :display block :width 66% - :border-top 1px solid #666 + :border 1px solid #ccc :height auto + :border-radius 5px + :-webkit-border-radius 5px + :-moz-border-radius 5px + + :box-shadow 0 1px 2px #fff + :-moz-box-shadow 0 1px 2px #fff + :-webkit-box-shadow 0 1px 2px #fff + #submit_block :text :align right @@ -526,10 +534,6 @@ label :top 0 :bottom 0 - :box-shadow 0 1px 2px #fff - :-moz-box-shadow 0 1px 2px #fff - :-webkit-box-shadow 0 1px 2px #fff - .button :margin-left 100px diff --git a/script/server b/script/server index 3804ccad9..259ad06cb 100755 --- a/script/server +++ b/script/server @@ -7,6 +7,9 @@ then echo "Mongod not started" else mkdir -p -v log/thin/ + #force AGPL + tar cf ../_source.tar --exclude='*.yml' --exclude='public/uploads' * + mv ../_source.tar public/source.tar bundle exec ruby ./script/websocket_server.rb& bundle exec thin start $@ fi From a53d15f50abdb4c2082dab88b07ad05c63239068 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Wed, 29 Sep 2010 17:45:36 -0400 Subject: [PATCH 2/6] update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d02467332..bd8338dc5 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ config/app_config.yml bin/* nbproject config/initializers/secret_token.rb +public/source.tar From f1f7ce338f13cfa13fa75d2b497aa1d2d284a4c0 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Thu, 30 Sep 2010 13:40:36 -0400 Subject: [PATCH 3/6] tar ignores files specified in .gitignore --- script/server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/server b/script/server index 259ad06cb..da43895fd 100755 --- a/script/server +++ b/script/server @@ -8,7 +8,7 @@ then else mkdir -p -v log/thin/ #force AGPL - tar cf ../_source.tar --exclude='*.yml' --exclude='public/uploads' * + tar cf ../_source.tar -X .gitignore * mv ../_source.tar public/source.tar bundle exec ruby ./script/websocket_server.rb& bundle exec thin start $@ From 2cd8cf0621b0b830f02822f89886f53b70d2644a Mon Sep 17 00:00:00 2001 From: Raphael Date: Sat, 2 Oct 2010 20:29:35 -0400 Subject: [PATCH 4/6] Remove a bunch of deleted backer servers --- config/deploy_config.yml | 41 +++------------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/config/deploy_config.yml b/config/deploy_config.yml index 6aacbf3ff..a502bfffb 100644 --- a/config/deploy_config.yml +++ b/config/deploy_config.yml @@ -12,52 +12,17 @@ servers: tom: - url: 'tom.joindiaspora.com' backer: - - username: 'washington' - given_name: 'George' - family_name: 'Washington' - number: 0 - pin: 5072 - - username: 'adams' + - username: 'adams' given_name: 'John' family_name: 'Adams' number: 1 pin: 3742 - - username: 'jefferson' - given_name: 'Thomas' - family_name: 'Jefferson' - number: 2 - pin: 7782 - - username: 'madison' - given_name: 'James' - family_name: 'Madison' - number: 3 - pin: 2691 - - username: 'monroe' - given_name: 'James' - family_name: 'Monroe' - number: 4 - pin: 6133 - - username: 'quincyadams' - given_name: 'John Quincy' - family_name: 'Adams' - number: 5 - pin: 7558 - - username: 'jackson' + - username: 'jackson' given_name: 'Andrew' family_name: 'Jackson' number: 6 pin: 8670 - - username: 'buren' - given_name: 'Martin' - family_name: 'Van Buren' - number: 7 - pin: 1559 - - username: 'harrison' - given_name: 'William Henry' - family_name: 'Harrison' - number: 8 - pin: 5404 - - username: 'tyler' + - username: 'tyler' given_name: 'John' family_name: 'Tyler' number: 9 From a09a6d82b75f1571ce673a40920ab1479bca2b0f Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg Date: Mon, 4 Oct 2010 09:45:12 -0700 Subject: [PATCH 5/6] updated bundler dependency to include newer ones --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 16788eeb3..29ad0f73d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'http://rubygems.org' gem 'rails', '3.0.0' -gem 'bundler', '1.0.0' +gem 'bundler', '>= 1.0.0' #Security gem 'devise', :git => 'http://github.com/BadMinus/devise.git' From be909e27d6268e815a928ca46f19dd190252754d Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 4 Oct 2010 14:49:27 -0400 Subject: [PATCH 6/6] Deleting adams --- config/deploy_config.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/config/deploy_config.yml b/config/deploy_config.yml index a502bfffb..c7477314a 100644 --- a/config/deploy_config.yml +++ b/config/deploy_config.yml @@ -12,17 +12,12 @@ servers: tom: - url: 'tom.joindiaspora.com' backer: - - username: 'adams' - given_name: 'John' - family_name: 'Adams' - number: 1 - pin: 3742 - - username: 'jackson' + - username: 'jackson' given_name: 'Andrew' family_name: 'Jackson' number: 6 pin: 8670 - - username: 'tyler' + - username: 'tyler' given_name: 'John' family_name: 'Tyler' number: 9