From 195108f7fc53702ffdfec03e33929cafcd2fe5db Mon Sep 17 00:00:00 2001
From: maco <maco.m@ubuntu.com>
Date: Thu, 16 Sep 2010 23:13:33 +0000
Subject: [PATCH 01/32] README.md: add PPA instructions for rubygems 1.3.7 for
 Ubuntu 10.04

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 9ae943073..c0d019c4e 100644
--- a/README.md
+++ b/README.md
@@ -147,13 +147,13 @@ To install Git on **Mac OS X**, run the following:
 
 ### Rubygems
 
-On **Ubuntu**, run the following:
+On **Ubuntu** 10.04, run the following:
 
-		wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
-		tar -xf rubygems-1.3.7.tgz
-		cd rubygems-1.3.7
-		sudo ruby setup.rb
-		sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
+		sudo add-apt-repository ppa:maco.m/ruby
+		sudo apt-get update
+		sudo apt-get install rubygems
+
+This PPA is maintained by an Ubuntu Developer. For Ubuntu 10.10, this version of rubygems is in the repositories.
 
 On **Fedora**, run the following:
 

From 60d5e6a86735c990b8e2b9dfca24c5fbba259549 Mon Sep 17 00:00:00 2001
From: maco <maco.m@ubuntu.com>
Date: Thu, 16 Sep 2010 23:25:21 +0000
Subject: [PATCH 02/32] README.md: add note about bundle's location with Ubuntu
 debs

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c0d019c4e..df195beea 100644
--- a/README.md
+++ b/README.md
@@ -164,7 +164,7 @@ On **Mac OS X**, RubyGems comes preinstalled; however, you might need to update
 
 ### Bundler
 
-After RubyGems is updated, simply run `sudo gem install bundler` to get Bundler.
+After RubyGems is updated, simply run `sudo gem install bundler` to get Bundler.  If you're using Ubuntu repository .debs, bundler is found at /var/lib/gems/1.8/bin/bundle
 
 
 ## Getting Diaspora

From cc44dcc7a4776b2c1fdc511728b97b8e0b43703f Mon Sep 17 00:00:00 2001
From: maco <maco.m@ubuntu.com>
Date: Fri, 17 Sep 2010 20:40:33 +0000
Subject: [PATCH 03/32] ubuntu-setup.bash: for rubygems, use maverick's repo or
 if lucid use ppa or if old use tarball. create
 /var/lib/gems/1.8/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games-friendly
 symlink if using debs

---
 ubuntu-setup.bash | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash
index 67b602abe..2924266a5 100644
--- a/ubuntu-setup.bash
+++ b/ubuntu-setup.bash
@@ -54,18 +54,32 @@ echo "Installed git-core.."
 # Setting up ruby gems
 echo "Fetching and installing ruby gems.."
 (
-    echo "."
-    cd /tmp 
-    wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
-    echo "."
-    tar -xf rubygems-1.3.7.tgz
-    echo "."
-    cd rubygems-1.3.7
-    echo "."
-    sudo ruby setup.rb
-    echo "."
-    sudo ln -s /usr/bin/gem1.8 /usr/bin/gem 
-    echo "."    
+    RELEASE=$(lsb_release -c | cut -f2)
+    if [ RELEASE == "maverick" ]
+	then
+    	sudo apt-get install --no-install-recommends -y rubygems
+		sudo ln -s /var/lib/gems/1.8/bin/bundle /usr/local/bin/bundle #for PATH
+	elsif [ RELEASE == "lucid" ]
+    then
+        sudo add-apt-repository ppa:maco.m/ruby
+        sudo apt-get update
+    	sudo apt-get install --no-install-recommends -y rubygems
+		sudo ln -s /var/lib/gems/1.8/bin/bundle /usr/local/bin/bundle #for PATH
+	else
+		# Old version
+		echo "."
+		cd /tmp 
+		wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
+		echo "."
+		tar -xf rubygems-1.3.7.tgz
+		echo "."
+		cd rubygems-1.3.7
+		echo "."
+		sudo ruby setup.rb
+		echo "."
+		sudo ln -s /usr/bin/gem1.8 /usr/bin/gem 
+		echo "."    
+    fi  
 ) 
 echo "Done installing the gems.."
 

From 109cb49a9e5494c2e87794f504c52b5c1c820eda Mon Sep 17 00:00:00 2001
From: maco <maco.m@ubuntu.com>
Date: Sat, 18 Sep 2010 22:10:19 +0000
Subject: [PATCH 04/32] ubuntu-setup.bash: fix s/blunder/bundler/ and
 s/elsif/elif/

---
 ubuntu-setup.bash | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash
index 2924266a5..06720b3f3 100644
--- a/ubuntu-setup.bash
+++ b/ubuntu-setup.bash
@@ -59,7 +59,7 @@ echo "Fetching and installing ruby gems.."
 	then
     	sudo apt-get install --no-install-recommends -y rubygems
 		sudo ln -s /var/lib/gems/1.8/bin/bundle /usr/local/bin/bundle #for PATH
-	elsif [ RELEASE == "lucid" ]
+	elif [ RELEASE == "lucid" ]
     then
         sudo add-apt-repository ppa:maco.m/ruby
         sudo apt-get update
@@ -83,10 +83,10 @@ echo "Fetching and installing ruby gems.."
 ) 
 echo "Done installing the gems.."
 
-# Install blunder
-echo "Installing blunder.."
+# Install bundler
+echo "Installing bundler.."
 sudo gem install bundler
-echo "Installed blunder.."
+echo "Installed bundler.."
 
 # Take a clone of Diaspora
 (

From 2aaf16f7dba90468431c8d699bda999140840c39 Mon Sep 17 00:00:00 2001
From: Vincent Batts <vbatts@hashbangbash.com>
Date: Tue, 28 Sep 2010 07:50:27 +0000
Subject: [PATCH 05/32] scripts/ubuntu-setup.bash: only count universe as
 enabled if it's a binary repo and uncommented

Signed-off-by: maco <maco.m@ubuntu.com>
---
 script/ubuntu-setup.bash | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/ubuntu-setup.bash b/script/ubuntu-setup.bash
index c335fcf65..85777fc93 100755
--- a/script/ubuntu-setup.bash
+++ b/script/ubuntu-setup.bash
@@ -24,9 +24,10 @@ We need to do some actions as an ordinary user. We use sudo where necessary." &&
 sudo -v >/dev/null 2>&1 || { echo $(whoami) has no sudo privileges ; exit 1; }
 
 # Check if universal repository is enabled 
-grep -i universe /etc/apt/sources.list > /dev/null || \
+grep -ie '^deb .*universe' /etc/apt/sources.list > /dev/null || \
     { echo "Please enable universe repository" ; exit 1 ; }
 
+
 # Make sure that we only install the latest version of packages
 sudo apt-get update
 

From ee1f2063b4bdcc82d95e9f2ff89a9e2390a6ad56 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 5 Oct 2010 00:11:13 +0200
Subject: [PATCH 06/32] Initial, buggy file check in

---
 pkg/fedora/README.fedora        |  27 ++++
 pkg/fedora/diaspora-bundle.spec | 213 ++++++++++++++++++++++++++++++
 pkg/fedora/diaspora-ws          | 102 +++++++++++++++
 pkg/fedora/diaspora.logconf     |  12 ++
 pkg/fedora/diaspora.spec        | 110 ++++++++++++++++
 pkg/fedora/make_dist.sh         | 223 ++++++++++++++++++++++++++++++++
 6 files changed, 687 insertions(+)
 create mode 100755 pkg/fedora/README.fedora
 create mode 100644 pkg/fedora/diaspora-bundle.spec
 create mode 100755 pkg/fedora/diaspora-ws
 create mode 100644 pkg/fedora/diaspora.logconf
 create mode 100644 pkg/fedora/diaspora.spec
 create mode 100755 pkg/fedora/make_dist.sh

diff --git a/pkg/fedora/README.fedora b/pkg/fedora/README.fedora
new file mode 100755
index 000000000..851a5b330
--- /dev/null
+++ b/pkg/fedora/README.fedora
@@ -0,0 +1,27 @@
+#Build ruby-1.8.7 on Fedora 13
+#============================
+set -x
+
+
+
+rpmdir=$(rpm --showrc | grep _rpmdir | cut -f2)
+echo "Building rpms in $rpmdir"
+
+sudo yum install yum-utils  fedora-release-rawhide
+
+yumdownloader --enablerepo=rawhide --source ruby
+vers=$( ls ruby-*src.rpm)
+vers=$(echo ${vers%.fc*})
+vers=$(echo ${vers#ruby-})
+echo "Downloaded and uding version $vers"
+
+sudo yum install $( rpm -q --requires -p ruby*src.rpm | grep -v rpmlib)
+rpmbuild --rebuild ruby-1.8.7.302-1.fc15.src.rpm
+sudo rpm -i $rpmdir/i686/ruby-$vers.i686.rpm 
+sudo rpm -i $rpmdir/i686/ruby-libs-$vers.i686.rpm 
+sudo rpm -i $rpmdir/i686/ruby-irb-$vers.i686.rpm
+sudo rpm -i $rpmdir/noarch/ruby-rdoc-$rdoc.noarch.rpm 
+
+rpmbuild --rebuild rubygems-*.src.rpm
+sudo rpm -i $rpmdir/noarch/rubygems-*.noarch.rpm
+
diff --git a/pkg/fedora/diaspora-bundle.spec b/pkg/fedora/diaspora-bundle.spec
new file mode 100644
index 000000000..ccf7018c2
--- /dev/null
+++ b/pkg/fedora/diaspora-bundle.spec
@@ -0,0 +1,213 @@
+%define         git_release     1010040945_a09a6d8
+# Turn off the brp-python-bytecompile script
+%global __os_install_post %(echo '%{__os_install_post}' | 
+       sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
+
+Summary:        Rubygem bundle for diaspora
+Name:           diaspora-bundle
+Version:        0.0
+Release:        1.%{git_release}%{?dist}
+License:        AGPLv3 
+Group:          Applications/Communications
+URL:            http://www.joindiaspora.com/
+Vendor:         joindiaspora.com
+Source:         %{name}-%{version}-%{git_release}.tar.gz
+Prefix:         %{_prefix}
+BuildRequires:  git
+Requires:       ruby(abi) = 1.8
+
+%description
+The ruby apps bundled with diaspora, as provided by
+bundle install --deployment and patched for Fedora use.
+
+%package devel
+Summary:   Development files (i. e., sources) for diaspora-bundle
+Group:     Development/Libraries
+Requires:  %{name} = %{version}
+
+%description devel
+Source file usede to compile native libraries in diaspora-bundle.
+
+
+
+%prep
+%setup -q -n %{name}-%{version}-%{git_release}
+
+pushd bundle/ruby/1.8/
+    find . -name \*.css -exec  chmod 644 {} \;
+    find . -name \*.js -exec  chmod 644 {} \;
+    find . -name \*.treetop -exec  chmod 644 {} \;
+    find . -name \*.rdoc -exec  chmod 644 {} \;
+    chmod 644 gems/term-ansicolor-1.0.5/CHANGES || :
+    chmod 755 gems/cucumber-rails-0.3.2/templates/install/script/cucumber || :
+    chmod 755 gems/ruby-debug-base-0.10.3/Rakefile || :
+    chmod 644 gems/cucumber-rails-0.3.2/History.txt || :
+    chmod 644 gems/cucumber-rails-0.3.2/templates/install/step_definitions/capybara_steps.rb.erb || :
+    chmod 644 gems/rack-1.2.1/test/cgi/lighttpd.conf || :
+    chmod 644 gems/term-ansicolor-1.0.5/VERSION || :
+    chmod 644 gems/mini_magick-2.1/Rakefile || :
+    chmod 755 gems/linecache-0.43/Rakefile || :
+    chmod 644 gems/ffi-0.6.3/ext/ffi_c/libffi/ltmain.sh || :
+    chmod 644 gems/term-ansicolor-1.0.5/README || :
+    chmod 755 gems/mini_magick-2.1/test/not_an_image.php || :
+    chmod 755 gems/rake-0.8.7/test/data/statusreturn/Rakefile || :
+    chmod 755 gems/ruby-debug-0.10.3/Rakefile || :
+    chmod 644 gems/gherkin-2.2.4/tasks/compile.rake || :
+    chmod 755 gems/rake-0.8.7/test/data/file_creation_task/Rakefile  || :
+    chmod 644 gems/term-ansicolor-1.0.5/Rakefile || :
+    chmod 755 gems/mime-types-1.16/Rakefile || :
+    for f in $(find . -name \*.rb); do
+      sed -i -e '/^#!/d' $f
+      chmod 0644 $f
+    done > /dev/null 2>&1
+    find . -type f -print0 | 
+        xargs --null sed -i 's|^#!/usr/local/bin/ruby|#!/usr/bin/ruby|'
+
+    chmod 755 gems/thin-1.2.7/example/async_chat.ru
+    chmod 755 gems/thin-1.2.7/example/async_tailer.ru
+    #chmod 644 master/public/stylesheets/brandongrotesque_light/demo.html
+    chmod 644 gems/i18n-0.4.1/MIT-LICENSE 
+    chmod 755 gems/abstract-1.0.0/abstract.gemspec
+    chmod 644 gems/mini_magick-2.1/MIT-LICENSE
+    #chmod 644 master/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg
+    chmod 755 gems/thin-1.2.7/lib/thin/controllers/service.sh.erb
+    chmod 644 gems/treetop-1.4.8/spec/compiler/test_grammar.tt
+
+    #sed -i -e "s|\r||" master/public/javascripts/jquery.cycle/src/jquery.cycle.lite.js
+    #sed -i -e "s|\r||" master/public/javascripts/fancybox/jquery.fancybox-1.3.1.js
+popd
+
+
+%build
+
+pushd bundle/ruby/1.8/
+    test -d gems/gherkin-*/ext && {
+    pushd gems/gherkin-*/ext
+    # Recompile all shared libraries using -O2 optimalization flagcd 
+    for lexer_dir in */ ; do
+        pushd $lexer_dir
+            sed -i 's/ -O0 / -O2 /' extconf.rb
+            # Remove #line lines from C sources
+            sed -i '/^#line/d' *.c
+            CONFIGURE_ARGS="--with-cflags='%{optflags}'" ruby extconf.rb
+            make clean && make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
+            make install RUBYARCHDIR="../../lib"
+            mv ../../lib/${lexer_dir%/}.so .
+            pushd  ../../lib
+                ln -sf ../ext/${lexer_dir%/}/${lexer_dir%/}.so .
+            popd
+        popd
+    done
+    popd
+    }
+
+    test -d gems/ffi-0.6.3/lib && {
+    pushd  gems/ffi-0.6.3/lib
+        rm ffi_c.so
+        ln -s ../ext/ffi_c/ffi_c.so .
+    popd
+    }
+
+    pushd  gems/thin-1.2.7/lib
+        rm thin_parser.so
+        ln -s ../ext/thin_parser/thin_parser.so .
+    popd
+
+    pushd gems/bson_ext-1.0.7/ext/bson_ext
+        rm cbson.so
+        ln -s ../cbson/cbson.so .
+    popd
+
+    pushd gems/ruby-debug-base-0.10.3/lib
+        rm ruby_debug.so
+        ln -s ../ext/ruby_debug.so .
+    popd
+
+    #in repo
+    pushd gems/eventmachine-0.12.10/lib
+       rm rubyeventmachine.so
+       rm fastfilereaderext.so
+       ln -s ../ext/rubyeventmachine.so .
+       ln -s ../ext/fastfilereader/fastfilereaderext.so .
+    popd
+
+    pushd gems/bcrypt-ruby-2.1.2/lib
+        rm bcrypt_ext.so
+        ln -s ../ext/mri/bcrypt_ext.so .
+    popd
+
+    # in repo
+    pushd gems/nokogiri-1.4.3.1/lib/nokogiri
+        rm nokogiri.so
+        ln -sf ../../ext/nokogiri/nokogiri.so .
+    popd
+
+    pushd gems/json-1.4.6/ext/json/ext/json/ext
+        rm generator.so
+        ln -s ../../generator/generator.so
+        rm parser.so
+        ln -s ../../parser/parser.so .
+    popd
+
+    #in repo
+    pushd gems/linecache-0.43/lib/
+        rm trace_nums.so
+        ln -s ../ext/trace_nums.so .
+    popd
+
+    pushd bundler/gems/em-http-request-6f66010cda90/lib
+       rm em_buffer.so
+        ln -s ../ext/buffer/em_buffer.so .
+        rm http11_client.so
+        ln -s ../ext/http11_client/http11_client.so .
+    popd
+popd
+
+
+%install
+find . -name .git | xargs rm -rf
+find . -name .gitignore -delete
+find . -name \*.o -delete  || :
+
+test -d bundle/ruby/1.8/gems/selenium-webdriver-0.0.28 && {
+pushd bundle/ruby/1.8/gems/selenium-webdriver-0.0.28/lib/selenium/webdriver/
+%ifarch  %ix86 x86_64
+%ifarch %ix86
+   rm -rf firefox/native/linux/amd64
+%else
+   rm -rf firefox/native/linux/i386
+%endif
+%else
+    rm -rf firefox/native/linux/i386
+    rm -rf firefox/native/linux/amd64
+%endif
+popd
+}
+
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/diaspora-bundle/master/vendor
+
+cp -ar  bundle $RPM_BUILD_ROOT/%{_libdir}/diaspora-bundle/master/vendor
+find  %{buildroot}/%{_libdir}/diaspora-bundle  \
+    -type d  -fprintf dirs '%%%dir "%%p"\n'
+find  -L %{buildroot}/%{_libdir}/diaspora-bundle  \
+    -regextype posix-awk -type f -not -regex '.*[.]c$|.*[.]h$|.*[.]cpp$' -fprintf files '"%%p"\n'
+find  %{buildroot}/%{_libdir}/diaspora-bundle -regextype posix-awk \
+   -type f -regex '.*[.]c$|.*[.]h$|.*[.]cpp$'  -fprintf dev-files '"%%p"\n' 
+sed -i  -e 's|%{buildroot}||' -e 's|//|/|' files dev-files dirs
+cat files >> dirs && cp dirs files 
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
+
+%files -f files
+%defattr(-, root, root, 0755)
+%doc  COPYRIGHT Gemfile AUTHORS GNU-AGPL-3.0
+
+%files -f dev-files devel
+%defattr(-, root, root, 0644)
+%doc COPYRIGHT AUTHORS GNU-AGPL-3.0
+
+%changelog
+* Sat Oct 02 2010 Alec Leamas  <leamas.alec@gmail.com>       1.1009271539_08b9aa8
+  - Initial attempt to create a spec file
diff --git a/pkg/fedora/diaspora-ws b/pkg/fedora/diaspora-ws
new file mode 100755
index 000000000..6208acc1c
--- /dev/null
+++ b/pkg/fedora/diaspora-ws
@@ -0,0 +1,102 @@
+#!/bin/bash
+#
+#	/etc/rc.d/init.d/diaspora-ws
+#
+# Starts the diaspora websocket server
+#
+# chkconfig: - 80 80
+# description: Diaspora websocket server
+
+### BEGIN INIT INFO
+# Provides: diaspora-ws
+# Required-Start: $local_fs $network
+# Required-Stop: $local_fs $network
+# Should-Start: $remote_fs
+# Should-Stop: $remote_fs
+# Default-Start: 
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: start and stop Diaspora websocket server
+# Description: The websocket server provides websocket services for
+#              diaspora. 
+### END INIT INFO
+
+# Source function library.
+. /etc/init.d/functions
+
+if [ -f /etc/sysconfig/diaspora-ws -a $UID -eq 0 ]; then
+    . /etc/sysconfig/diaspora-ws
+fi
+
+cd  /usr/share/diaspora
+
+RETVAL=0
+prog="Diaspora websocket server"
+exec="script/websocket_server.rb"
+pidfile="/var/run/diaspora-ws"
+lockfile="/var/lock/subsys/diaspora-ws"
+logfile=/var/log/diaspora-ws.log
+
+[ -n "$OPTIONS" ] && OPTIONS=" $OPTIONS"
+ruby_cmd="ruby -C $PWD $exec$OPTIONS"
+
+start() {
+	[ $UID -eq 0 ] || exit 4
+	[ -f $exec ]   || exit 5
+
+        echo -n $"Starting $prog: "
+	daemon --pidfile $pidfile "$ruby_cmd >>$logfile 2>&1 &"
+	RETVAL=$?
+        echo
+	if test $RETVAL = 0; then
+            touch  $lockfile
+            pgrep -f "$ruby_cmd" > $pidfile || {
+                echo "Warning: cannot find running diaspora-webserver"
+                exit 7
+            }
+        fi
+}
+
+stop() {
+	[ $UID -eq 0 ] || exit 4
+	echo -n $"Stopping $prog: "
+	killproc -p $pidfile $exec
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && rm -f $lockfile
+	echo
+}
+
+#
+#	See how we were called.
+#
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  force-reload|restart)
+	stop
+	sleep 1
+	start
+	RETVAL=$?
+	;;
+  condrestart|try-restart)
+	if [ -f $lockfile ]; then
+	    stop
+	    sleep 3
+	    start
+	fi
+	;;
+  status)
+	status -p $pidfile $exec
+	RETVAL=$?
+	;;
+  *)
+	echo $"Usage: $0 {condrestart|try-restart|start|stop|restart|force-reload|status}"
+	RETVAL=2
+	[ "$1" = 'usage' ] && RETVAL=0
+esac
+
+exit $RETVAL
+
diff --git a/pkg/fedora/diaspora.logconf b/pkg/fedora/diaspora.logconf
new file mode 100644
index 000000000..e51c705ed
--- /dev/null
+++ b/pkg/fedora/diaspora.logconf
@@ -0,0 +1,12 @@
+/var/log/diaspora/*.log {
+       weekly
+       rotate 10
+       copytruncate
+       delaycompress
+       compress
+       notifempty
+       missingok
+       postrotate
+ 	  (/sbin/service diaspora-ws status | grep running /sbin/servive diaspora-ws restart || :)  >/dev/null 2>&1
+       endscript
+}
diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
new file mode 100644
index 000000000..5aaa5a544
--- /dev/null
+++ b/pkg/fedora/diaspora.spec
@@ -0,0 +1,110 @@
+# 
+#  Build diaspora RPM package.
+#
+#  Packages current HEAD if the diaspora master branch
+#  to a reasonable Fedora RPM.
+#
+#  If the environment variable GIT_VERSION is set, builds an rpm
+#  from this version (i. e., uses this commit).
+#
+%define         git_release     HEAD
+
+Summary:        A social network server
+Name:           diaspora
+Version:        0.0.1
+Release:        1.%{git_release}%{?dist}
+License:        AGPLv3 
+Group:          Applications/Communications
+URL:            http://www.joindiaspora.com/
+Vendor:         joindiaspora.com
+Source:         %{name}-%{version}-%{git_release}.tar.gz
+Source1:        diaspora-ws
+#BuildRoot:      %{_tmppath}/root-%{name}-%{version}
+#Prefix:         %{_prefix}
+
+BuildRequires:  git
+Requires(pre):  shadow-utils
+Requires:       mongodb-server
+Requires:       ruby(abi) = 1.8
+Requires:       diaspora-bundle = %{version}
+
+%description
+A privacy aware, personally controlled, do-it-all and
+open source social network server.
+
+%pre
+getent group diaspora >/dev/null || groupadd -r diaspora
+getent passwd diaspora >/dev/null ||   \
+    useradd -r -g diaspora             \
+    -md /var/diaspora -s /sbin/nologin \
+    -c "Diaspora daemon" diaspora
+exit 0
+
+%prep
+%setup -q -n %{name}-%{version}-%{git_release}
+mkdir diaspora/tmp || :
+
+%build
+find . -name .git* -execdir rm -rf {} \; || :
+#find . -name test -execdir rm -rf {} \; || : > /dev/null 2>&1
+find . -name \*.css -exec  chmod 644 {} \;
+find . -name \*.js -exec  chmod 644 {} \;
+#find . -name \*.treetop -exec  chmod 644 {} \;
+find . -name \*.rdoc -exec  chmod 644 {} \;
+#find . -name Rakefile -exec  chmod 755  {} \;
+#for f in $(find . -name \*.rb); do
+#  sed -i -e '/^#!/d' $f
+#  chmod 0644 $f
+#done > /dev/null 2>&1
+find . -type f -exec \
+    sed -i 's/^#!\/usr\/local\/bin\/ruby/#!\/usr\/bin\/ruby/g' {} \; > /dev/null
+
+chmod 644 master/public/stylesheets/brandongrotesque_light/demo.html
+chmod 644 master/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg
+sed -i -e "s|\r||" master/public/javascripts/jquery.cycle/src/jquery.cycle.lite.js
+sed -i -e "s|\r||" master/public/javascripts/fancybox/jquery.fancybox-1.3.1.js
+
+
+%install
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/diaspora/master/vendor
+cp master/README.md .
+mv master/GNU-AGPL-3.0 .
+
+sed -i '/^cd /s|.*|cd %{_datadir}/diaspora/master|' diaspora-ws
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/diaspora
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
+cp diaspora-ws $RPM_BUILD_ROOT/etc/init.d
+mkdir -p  $RPM_BUILD_ROOT/etc/logrotate.d
+cp diaspora  $RPM_BUILD_ROOT/etc/logrotate.d
+
+%post
+/bin/chown diaspora:diaspora %{_localstatedir}/log/diaspora
+ln -sf  %{_localstatedir}/log/diaspora \
+        %{_datadir}/diaspora/master/log || :
+ln -sf %{_libdir}/diaspora/master/vendor/bundle \
+       %{_datadir}/diaspora/master/vendor || :
+/sbin/chkconfig --add  diaspora-ws
+
+%preun
+if [ $1 -eq 0 ] ; then
+    service diaspora-ws stop  >/dev/null 2>&1 || :
+    /sbin/chkconfig --del  diaspora-ws
+fi
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
+
+%files
+%defattr(-, root, root, 0755)
+%doc  README.md GNU-AGPL-3.0
+%{_datadir}/diaspora
+%{_libdir}/diaspora
+%{_localstatedir}/log/diaspora
+%config(noreplace) %{_sysconfdir}/logrotate.d/diaspora
+%{_sysconfdir}/init.d/diaspora-ws
+
+%changelog
+* Fri Sep 24 2010 Alec Leamas  <leamas.alec@gmail.com>       1.1009280542_859ec2d
+  - Initial attempt to create a spec file
diff --git a/pkg/fedora/make_dist.sh b/pkg/fedora/make_dist.sh
new file mode 100755
index 000000000..3c9085b3c
--- /dev/null
+++ b/pkg/fedora/make_dist.sh
@@ -0,0 +1,223 @@
+#!/bin/bash
+
+#Usage: make_dist [-b] [-d] [s] [-c <commit>] 
+#
+# -b create a bundler bundle for diaspora
+# -d create a diaspora source tarball
+# -s synchronize Gemfile.lock VERY INTRUSIVE to RUBY ENVIRONMENT
+# -c Use a given commit instead of last available
+
+#
+# Create a diaspora distribution
+#
+# Builds a diaspora distribution containing the application and bundled
+# libraries. Normally checks out latest version of the master branch.
+#
+GIT_REPO='http://github.com/diaspora/diaspora.git'
+RELEASE='HEAD'
+VERSION='0.0'
+
+function git_id
+#
+# Echo package-friendly source id.
+#
+# Usage: git_id [-n] [file or directory]
+#
+{
+    nl="\n"
+    file_or_dir="$PWD"
+    test "$1" = '-n' && { nl=""; shift; }
+    test -n "$1" && file_or_dir="$1"
+    if [ -d $file_or_dir ]; then
+        file=""
+        dir=$file_or_dir
+    else
+        file=$(basename $file_or_dir) 
+        dir=$(dirname $file_or_dir)
+    fi    
+
+    export LANG=C
+    (
+        cd $dir
+        git log -1 --abbrev-commit --date=iso $file |
+        awk  -v nl="$nl" \
+         ' /commit/       { commit = $2 }
+           /Date/         { split( $2, d, "-")
+                            split( $3, t, ":")
+                          }
+           END            { printf( "%s%s%s%s%s_%s%s",
+                                substr( d[1],3), d[2], d[3],
+                                t[1], t[2],
+                                commit, nl)
+                          }'
+    )
+}
+
+
+function fix_alphatag()
+#  Patch version on top comment first id line:
+#  Uses %define git_release to get release.
+#* Fri Sep 24 2010 name surname  <email@com>     1.20100925_faf234320
+{
+set -x
+    dist=$(rpm --eval %dist)
+    awk  -v dist="$dist" -v version="$2"  \
+        ' BEGIN         { done = 0 }
+          /%define/     { if ($2 = "git_release") release = $3 }
+          /^[*]/        { if (done)
+                             print
+                          else
+                          {
+                             gsub( "1[.].*", "")
+                             printf( "%s%s-1.%s%s\n", 
+                                     $0, version, release,dist)
+                             done = 1
+                          }
+                          next
+                        }
+                        { print }' \
+    < $1 > $1.tmp && cp $1.tmp $1 && rm $1.tmp
+}
+
+function fix_bundle_deps
+# usage: fix_bundle_deps <specfile> <version> release
+# Patches Requires:   diaspora-bundle = 0.0-20101021-aefsf323148
+{
+	awk -v vers="$2-$3" \
+		' /Requires:/ { if ($2 == "diaspora-bundle")
+				    printf( "%s	%s = %s\n", $1,$2,vers)
+				else
+				    print				    
+				next
+			       }
+			       { print}' \
+             < $1 > $1.tmp && cp $1.tmp $1 && rm $1.tmp			    
+}
+
+function patch()
+# Patch git_release, Requires: diaspora-bundle and top comment version.
+# Usage: patch VERSION RELEASE
+{
+	sed -e "/^%%define/s|HEAD|$2|"                  \
+            -e '/^Version:/s|.*|Version:        '$1'|' \
+                <diaspora.spec >dist/diaspora.spec                              
+	fix_alphatag dist/diaspora.spec $1
+	mkdir dist/diaspora/tmp
+	bundle_id=$(git_id dist/diaspora/Gemfile)
+	fix_bundle_deps  dist/diaspora.spec $1 $bundle_id
+	sed -e "/^%%define/s|HEAD|$bundle_deps|"                  \
+            -e '/^Version:/s|.*|Version:        '$1'|' \
+                < diaspora-bundle.spec > dist/diaspora-bundle.spec
+	
+	cp dist/diaspora.spec dist/diaspora/diaspora.spec
+}
+
+function checkout()
+# Checkout last version of dispora unless it's already there.
+{   
+    mkdir dist || :
+    (
+        cd dist 
+        rm -rf diaspora; git clone --quiet $GIT_REPO;      \
+        cd diaspora; 
+        git checkout --quiet -b dist $GIT_VERSION; 
+        git_id  -n 
+    )
+}
+
+
+function make_dist
+# Create a distribution tarball
+{
+    commit=$(checkout)
+    patch $VERSION $commit 
+	
+    RELEASE_DIR="diaspora-$VERSION-$commit"
+    rm -rf dist/${RELEASE_DIR} 
+    mkdir dist/${RELEASE_DIR}
+    cp diaspora-ws    dist/${RELEASE_DIR}
+    cp diaspora.logconf  dist/${RELEASE_DIR}/diaspora
+    cd dist
+    mkdir ${RELEASE_DIR}/master
+    cp -ar diaspora/*  ${RELEASE_DIR}/master	
+    mv  ${RELEASE_DIR}/master/diaspora.spec  ${RELEASE_DIR}
+    tar czf ${RELEASE_DIR}.tar.gz  ${RELEASE_DIR} && rm -rf ${RELEASE_DIR}
+}
+
+#set -x
+#mkdir dist || :
+#pushd dist
+#    test -d diaspora || {
+##         git clone  $GIT_REPO;      
+#         pushd diaspora
+#             git checkout -b dist $RELEASE;
+#	     git add upstream $GIT_REPO#
+#	 popd
+#    }
+#    pushd diaspora
+#        git fetch upstream
+#        git merge upstream/master
+#    popd
+#popd
+
+function make_bundle()
+{
+    bundle_id=$(git_id dist/diaspora/Gemfile)
+    bundle_name="diaspora-bundle-$VERSION-$bundle_id"
+    test -e  "$bundle_name" || {
+       	cd dist
+	    rm -rf $bundle_name 
+	    mkdir -p $bundle_name/bundle
+	    pushd diaspora
+	        bundle  install --deployment --path="../$bundle_name/bundle"  --without=test rdoc
+	       cp AUTHORS Gemfile GNU-AGPL-3.0 COPYRIGHT "../$bundle_name"
+            popd
+            tar czf $bundle_name.tar.gz $bundle_name
+    }
+}
+
+function usage()
+{
+    	cat <<- EOF
+		Usage: make_dist [-c commit] <dist|bundle|fix_gemlock>
+		-c             Use a given commit, defaults to last checked in.
+		dist           Build a diaspora application tarball.
+		bundle         Build a bundler(1) bundle for diaspora.
+		fix_gemlock    Try to fix out-of order gemlock, VERY INTRUSIVE.
+		
+		All results are stored in dist/
+	EOF
+}		
+set -x
+test "$1" = "-h"  -o $# = 0 && {
+    usage;
+    exit 0
+}
+
+test "$1" = "-c" && {
+    test-z "$2" && {
+        usage;
+        exit 1
+    }
+    commit="$2"
+    shift; shift
+}
+    
+    
+ case $1 in
+ 
+     "bundle")  make_bundle $commit
+                ;;
+     "dist")    make_dist $commit
+                ;;
+     "fix_gemfile")
+                fix_gemfile
+                ;;
+                
+            *)  usage
+                exit 1
+                ;;
+ esac
+ 
+         
+

From b0abe9db079bf95fdc28a7b4d816a682f97d9f95 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 5 Oct 2010 00:12:00 +0200
Subject: [PATCH 07/32] bugfix

---
 pkg/fedora/README.fedora | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 pkg/fedora/README.fedora

diff --git a/pkg/fedora/README.fedora b/pkg/fedora/README.fedora
old mode 100755
new mode 100644

From ff48b6cd7b36dc0393c8cc17486e28e600e8214d Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 5 Oct 2010 15:19:21 +0200
Subject: [PATCH 08/32] provisionary, passes rpmbuild and rpmplint (more or
 less)

---
 pkg/fedora/README.fedora | 28 +-------------------
 pkg/fedora/diaspora.spec | 53 ++++++++++++++++++--------------------
 pkg/fedora/make_dist.sh  | 55 ++++++++++++++++++++++++++++++++--------
 3 files changed, 70 insertions(+), 66 deletions(-)

diff --git a/pkg/fedora/README.fedora b/pkg/fedora/README.fedora
index 851a5b330..a0990367e 100644
--- a/pkg/fedora/README.fedora
+++ b/pkg/fedora/README.fedora
@@ -1,27 +1 @@
-#Build ruby-1.8.7 on Fedora 13
-#============================
-set -x
-
-
-
-rpmdir=$(rpm --showrc | grep _rpmdir | cut -f2)
-echo "Building rpms in $rpmdir"
-
-sudo yum install yum-utils  fedora-release-rawhide
-
-yumdownloader --enablerepo=rawhide --source ruby
-vers=$( ls ruby-*src.rpm)
-vers=$(echo ${vers%.fc*})
-vers=$(echo ${vers#ruby-})
-echo "Downloaded and uding version $vers"
-
-sudo yum install $( rpm -q --requires -p ruby*src.rpm | grep -v rpmlib)
-rpmbuild --rebuild ruby-1.8.7.302-1.fc15.src.rpm
-sudo rpm -i $rpmdir/i686/ruby-$vers.i686.rpm 
-sudo rpm -i $rpmdir/i686/ruby-libs-$vers.i686.rpm 
-sudo rpm -i $rpmdir/i686/ruby-irb-$vers.i686.rpm
-sudo rpm -i $rpmdir/noarch/ruby-rdoc-$rdoc.noarch.rpm 
-
-rpmbuild --rebuild rubygems-*.src.rpm
-sudo rpm -i $rpmdir/noarch/rubygems-*.noarch.rpm
-
+TBD
diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
index 5aaa5a544..8e7a2ef39 100644
--- a/pkg/fedora/diaspora.spec
+++ b/pkg/fedora/diaspora.spec
@@ -7,6 +7,8 @@
 #  If the environment variable GIT_VERSION is set, builds an rpm
 #  from this version (i. e., uses this commit).
 #
+
+%global         debug_package %{nil} 
 %define         git_release     HEAD
 
 Summary:        A social network server
@@ -19,10 +21,10 @@ URL:            http://www.joindiaspora.com/
 Vendor:         joindiaspora.com
 Source:         %{name}-%{version}-%{git_release}.tar.gz
 Source1:        diaspora-ws
-#BuildRoot:      %{_tmppath}/root-%{name}-%{version}
-#Prefix:         %{_prefix}
+BuildArch:	noarch
 
 BuildRequires:  git
+
 Requires(pre):  shadow-utils
 Requires:       mongodb-server
 Requires:       ruby(abi) = 1.8
@@ -34,56 +36,50 @@ open source social network server.
 
 %pre
 getent group diaspora >/dev/null || groupadd -r diaspora
-getent passwd diaspora >/dev/null ||   \
-    useradd -r -g diaspora             \
-    -md /var/diaspora -s /sbin/nologin \
+getent passwd diaspora >/dev/null ||       \
+    useradd -r -g diaspora                 \
+    -md /var/lib/diaspora -s /sbin/nologin \
     -c "Diaspora daemon" diaspora
 exit 0
 
 %prep
 %setup -q -n %{name}-%{version}-%{git_release}
+
 mkdir diaspora/tmp || :
+find . -name .git  | xargs rm -rf || :
+find . -type f -exec \
+    sed -i 's|^#!/usr/local/bin/ruby|#!/usr/bin/ruby|' {} \; > /dev/null
+
+# Patch request: http://github.com/diaspora/diaspora/issues/issue/392
+find . -name \*.css -print0 | xargs --null chmod 644
+find . -name \*.js  -print0 | xargs --null chmod 644
+chmod 644 master/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg
+chmod 644 master/public/stylesheets/brandongrotesque_light/demo.html
 
 %build
-find . -name .git* -execdir rm -rf {} \; || :
-#find . -name test -execdir rm -rf {} \; || : > /dev/null 2>&1
-find . -name \*.css -exec  chmod 644 {} \;
-find . -name \*.js -exec  chmod 644 {} \;
-#find . -name \*.treetop -exec  chmod 644 {} \;
-find . -name \*.rdoc -exec  chmod 644 {} \;
-#find . -name Rakefile -exec  chmod 755  {} \;
-#for f in $(find . -name \*.rb); do
-#  sed -i -e '/^#!/d' $f
-#  chmod 0644 $f
-#done > /dev/null 2>&1
-find . -type f -exec \
-    sed -i 's/^#!\/usr\/local\/bin\/ruby/#!\/usr\/bin\/ruby/g' {} \; > /dev/null
-
-chmod 644 master/public/stylesheets/brandongrotesque_light/demo.html
-chmod 644 master/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg
-sed -i -e "s|\r||" master/public/javascripts/jquery.cycle/src/jquery.cycle.lite.js
-sed -i -e "s|\r||" master/public/javascripts/fancybox/jquery.fancybox-1.3.1.js
-
+rm -rf master/vendor/bundle
 
 %install
+
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/diaspora/master/vendor
 cp master/README.md .
 mv master/GNU-AGPL-3.0 .
 
-sed -i '/^cd /s|.*|cd %{_datadir}/diaspora/master|' diaspora-ws
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/log/diaspora
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
+sed -i '/^cd /s|.*|cd %{_datadir}/diaspora/master|' diaspora-ws
 cp diaspora-ws $RPM_BUILD_ROOT/etc/init.d
 mkdir -p  $RPM_BUILD_ROOT/etc/logrotate.d
-cp diaspora  $RPM_BUILD_ROOT/etc/logrotate.d
+cp diaspora.logconf  $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/diaspora
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
+cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora
 
 %post
 /bin/chown diaspora:diaspora %{_localstatedir}/log/diaspora
 ln -sf  %{_localstatedir}/log/diaspora \
         %{_datadir}/diaspora/master/log || :
-ln -sf %{_libdir}/diaspora/master/vendor/bundle \
+ln -sf %{_libdir}/diaspora-bundle/master/vendor/bundle \
        %{_datadir}/diaspora/master/vendor || :
 /sbin/chkconfig --add  diaspora-ws
 
@@ -100,7 +96,6 @@ fi
 %defattr(-, root, root, 0755)
 %doc  README.md GNU-AGPL-3.0
 %{_datadir}/diaspora
-%{_libdir}/diaspora
 %{_localstatedir}/log/diaspora
 %config(noreplace) %{_sysconfdir}/logrotate.d/diaspora
 %{_sysconfdir}/init.d/diaspora-ws
diff --git a/pkg/fedora/make_dist.sh b/pkg/fedora/make_dist.sh
index 3c9085b3c..b2ca4695e 100755
--- a/pkg/fedora/make_dist.sh
+++ b/pkg/fedora/make_dist.sh
@@ -59,7 +59,6 @@ function fix_alphatag()
 #  Uses %define git_release to get release.
 #* Fri Sep 24 2010 name surname  <email@com>     1.20100925_faf234320
 {
-set -x
     dist=$(rpm --eval %dist)
     awk  -v dist="$dist" -v version="$2"  \
         ' BEGIN         { done = 0 }
@@ -98,14 +97,14 @@ function patch()
 # Patch git_release, Requires: diaspora-bundle and top comment version.
 # Usage: patch VERSION RELEASE
 {
-	sed -e "/^%%define/s|HEAD|$2|"                  \
+	sed -e "/^%define/s|HEAD|$2|"                  \
             -e '/^Version:/s|.*|Version:        '$1'|' \
                 <diaspora.spec >dist/diaspora.spec                              
 	fix_alphatag dist/diaspora.spec $1
-	mkdir dist/diaspora/tmp
+	#mkdir dist/diaspora/tmp || :
 	bundle_id=$(git_id dist/diaspora/Gemfile)
-	fix_bundle_deps  dist/diaspora.spec $1 $bundle_id
-	sed -e "/^%%define/s|HEAD|$bundle_deps|"                  \
+	fix_bundle_deps  dist/diaspora.spec $1 "1.$bundle_id.fc13"
+	sed -e "/^%define/s|HEAD|$bundle_deps|"        \
             -e '/^Version:/s|.*|Version:        '$1'|' \
                 < diaspora-bundle.spec > dist/diaspora-bundle.spec
 	
@@ -113,12 +112,17 @@ function patch()
 }
 
 function checkout()
-# Checkout last version of dispora unless it's already there.
+# Checkout last version of diaspora unless it's already there.
+# Returns: commit for current branch's HEAD.
 {   
     mkdir dist || :
     (
         cd dist 
-        rm -rf diaspora; git clone --quiet $GIT_REPO;      \
+        test -d diaspora && {
+            ( cd diaspora; git_id -n)
+            return
+        }
+        git clone --quiet $GIT_REPO;      \
         cd diaspora; 
         git checkout --quiet -b dist $GIT_VERSION; 
         git_id  -n 
@@ -136,7 +140,7 @@ function make_dist
     rm -rf dist/${RELEASE_DIR} 
     mkdir dist/${RELEASE_DIR}
     cp diaspora-ws    dist/${RELEASE_DIR}
-    cp diaspora.logconf  dist/${RELEASE_DIR}/diaspora
+    cp diaspora.logconf  dist/${RELEASE_DIR}
     cd dist
     mkdir ${RELEASE_DIR}/master
     cp -ar diaspora/*  ${RELEASE_DIR}/master	
@@ -176,6 +180,34 @@ function make_bundle()
     }
 }
 
+function make_links()
+# Usage: make_links [source commit]
+{
+    dest=$(rpm --eval %_sourcedir)
+    test -z "$dest" && {
+        echo "Can't find RPM source directory, giving up."
+        exit 2
+    }
+
+    src_commit="$1"
+    test -z "$src_commit" && {
+         src_commit=$(checkout)
+    }
+    src="dist/diaspora-$VERSION-$src_commit.tar.gz"
+    ln -sf $PWD/$src $dest
+
+    bundle_commit=$(git_id dist/diaspora/Gemfile)
+    bundle="dist/diaspora-bundle-$VERSION-$bundle_commit.tar.gz"
+    ln -sf $PWD/$bundle $dest
+    cd $dest
+    find . -type l -not -readable -exec rm {} \;
+}
+
+    
+  
+
+
+
 function usage()
 {
     	cat <<- EOF
@@ -188,7 +220,6 @@ function usage()
 		All results are stored in dist/
 	EOF
 }		
-set -x
 test "$1" = "-h"  -o $# = 0 && {
     usage;
     exit 0
@@ -208,8 +239,12 @@ test "$1" = "-c" && {
  
      "bundle")  make_bundle $commit
                 ;;
-     "dist")    make_dist $commit
+     'source')    make_dist $commit
                 ;;
+
+     'links')   make_links $commit
+                ;;
+
      "fix_gemfile")
                 fix_gemfile
                 ;;

From 735bb847c2a9a75921f6ad5eb60e6c2b68da3028 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 5 Oct 2010 16:00:09 +0200
Subject: [PATCH 09/32] provisionary

---
 pkg/fedora/diaspora.spec | 1 +
 pkg/fedora/make_dist.sh  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
index 8e7a2ef39..9a409f526 100644
--- a/pkg/fedora/diaspora.spec
+++ b/pkg/fedora/diaspora.spec
@@ -74,6 +74,7 @@ mkdir -p  $RPM_BUILD_ROOT/etc/logrotate.d
 cp diaspora.logconf  $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/diaspora
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
 cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora
+cp master/.gitignore $RPM_BUILD_ROOT/%{_datadir}/diaspora/master
 
 %post
 /bin/chown diaspora:diaspora %{_localstatedir}/log/diaspora
diff --git a/pkg/fedora/make_dist.sh b/pkg/fedora/make_dist.sh
index b2ca4695e..3d5828e30 100755
--- a/pkg/fedora/make_dist.sh
+++ b/pkg/fedora/make_dist.sh
@@ -115,7 +115,7 @@ function checkout()
 # Checkout last version of diaspora unless it's already there.
 # Returns: commit for current branch's HEAD.
 {   
-    mkdir dist || :
+    mkdir dist  >/dev/null 2>&1 || :
     (
         cd dist 
         test -d diaspora && {
@@ -143,7 +143,7 @@ function make_dist
     cp diaspora.logconf  dist/${RELEASE_DIR}
     cd dist
     mkdir ${RELEASE_DIR}/master
-    cp -ar diaspora/*  ${RELEASE_DIR}/master	
+    cp -ar diaspora/*  diaspora/.gitignore ${RELEASE_DIR}/master	
     mv  ${RELEASE_DIR}/master/diaspora.spec  ${RELEASE_DIR}
     tar czf ${RELEASE_DIR}.tar.gz  ${RELEASE_DIR} && rm -rf ${RELEASE_DIR}
 }

From 55dd35dcc13ef9dc9241e760538eaa792500cddf Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 5 Oct 2010 17:29:40 +0200
Subject: [PATCH 10/32] provisionary

---
 pkg/fedora/diaspora.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
index 9a409f526..83355b87e 100644
--- a/pkg/fedora/diaspora.spec
+++ b/pkg/fedora/diaspora.spec
@@ -58,6 +58,9 @@ chmod 644 master/public/stylesheets/brandongrotesque_light/demo.html
 
 %build
 rm -rf master/vendor/bundle
+pushd  master
+    tar cf public/source.tar  --exclude='source.tar' -X .gitignore *
+popd
 
 %install
 

From 9f21b9383dd17b9f54110e91d1d1458628819a40 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 5 Oct 2010 21:47:17 +0200
Subject: [PATCH 11/32] Server start, but fails on missing .git dirs (!)

---
 pkg/fedora/.bundle/config   |  5 +++++
 pkg/fedora/source-fix.patch | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkg/fedora/.bundle/config
 create mode 100644 pkg/fedora/source-fix.patch

diff --git a/pkg/fedora/.bundle/config b/pkg/fedora/.bundle/config
new file mode 100644
index 000000000..1c3e2cedf
--- /dev/null
+++ b/pkg/fedora/.bundle/config
@@ -0,0 +1,5 @@
+--- 
+BUNDLE_FROZEN: "1"
+BUNDLE_DISABLE_SHARED_GEMS: "1"
+BUNDLE_WITHOUT: test:rdoc
+BUNDLE_PATH: vendor/bundle
diff --git a/pkg/fedora/source-fix.patch b/pkg/fedora/source-fix.patch
new file mode 100644
index 000000000..55dffae43
--- /dev/null
+++ b/pkg/fedora/source-fix.patch
@@ -0,0 +1,21 @@
+diff --git a/script/server b/script/server
+index da43895..c5357a3 100755
+--- a/script/server
++++ b/script/server
+@@ -7,9 +7,13 @@ then
+     echo "Mongod not started"
+ else
+     mkdir -p -v log/thin/
+-		#force AGPL
+-		tar cf ../_source.tar -X .gitignore *
+-		mv ../_source.tar public/source.tar
++    #force AGPL
++    test -w public -a ! -e  public/source.tar &&
++        tar cf public/source.tar  --exclude='source.tar' -X .gitignore *
++    test -e public/source.tar || {
++        echo "Can't find, or even create, public/source.tar. Giving up"
++        exit 2
++    }
+     bundle exec ruby ./script/websocket_server.rb&
+     bundle exec thin start $@
+ fi

From 995dc4ee6af6d0ec862ffc3888aa3a3eb3ab23de Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 6 Oct 2010 04:21:44 +0200
Subject: [PATCH 12/32] Server starts OK.

---
 pkg/fedora/diaspora-bundle.spec |  4 ----
 pkg/fedora/diaspora.spec        | 11 +++++++++--
 pkg/fedora/make_dist.sh         | 28 ++++++++++++++++++++++------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/pkg/fedora/diaspora-bundle.spec b/pkg/fedora/diaspora-bundle.spec
index ccf7018c2..87656f110 100644
--- a/pkg/fedora/diaspora-bundle.spec
+++ b/pkg/fedora/diaspora-bundle.spec
@@ -65,16 +65,12 @@ pushd bundle/ruby/1.8/
 
     chmod 755 gems/thin-1.2.7/example/async_chat.ru
     chmod 755 gems/thin-1.2.7/example/async_tailer.ru
-    #chmod 644 master/public/stylesheets/brandongrotesque_light/demo.html
     chmod 644 gems/i18n-0.4.1/MIT-LICENSE 
     chmod 755 gems/abstract-1.0.0/abstract.gemspec
     chmod 644 gems/mini_magick-2.1/MIT-LICENSE
-    #chmod 644 master/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg
     chmod 755 gems/thin-1.2.7/lib/thin/controllers/service.sh.erb
     chmod 644 gems/treetop-1.4.8/spec/compiler/test_grammar.tt
 
-    #sed -i -e "s|\r||" master/public/javascripts/jquery.cycle/src/jquery.cycle.lite.js
-    #sed -i -e "s|\r||" master/public/javascripts/fancybox/jquery.fancybox-1.3.1.js
 popd
 
 
diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
index 83355b87e..6adab3db1 100644
--- a/pkg/fedora/diaspora.spec
+++ b/pkg/fedora/diaspora.spec
@@ -23,6 +23,9 @@ Source:         %{name}-%{version}-%{git_release}.tar.gz
 Source1:        diaspora-ws
 BuildArch:	noarch
 
+# See http://github.com/diaspora/diaspora/issues/issue/393
+Patch0:		source-fix.patch
+
 BuildRequires:  git
 
 Requires(pre):  shadow-utils
@@ -44,9 +47,13 @@ exit 0
 
 %prep
 %setup -q -n %{name}-%{version}-%{git_release}
+pushd master 
+%patch0 -p1
+popd
 
-mkdir diaspora/tmp || :
-find . -name .git  | xargs rm -rf || :
+
+mkdir master/tmp || :
+#find . -name .git  | xargs rm -rf || :
 find . -type f -exec \
     sed -i 's|^#!/usr/local/bin/ruby|#!/usr/bin/ruby|' {} \; > /dev/null
 
diff --git a/pkg/fedora/make_dist.sh b/pkg/fedora/make_dist.sh
index 3d5828e30..7fbaea2aa 100755
--- a/pkg/fedora/make_dist.sh
+++ b/pkg/fedora/make_dist.sh
@@ -143,7 +143,8 @@ function make_dist
     cp diaspora.logconf  dist/${RELEASE_DIR}
     cd dist
     mkdir ${RELEASE_DIR}/master
-    cp -ar diaspora/*  diaspora/.gitignore ${RELEASE_DIR}/master	
+    cp -ar diaspora/*  diaspora/.git* ${RELEASE_DIR}/master	
+    cp -r ../.bundle ${RELEASE_DIR}/master
     mv  ${RELEASE_DIR}/master/diaspora.spec  ${RELEASE_DIR}
     tar czf ${RELEASE_DIR}.tar.gz  ${RELEASE_DIR} && rm -rf ${RELEASE_DIR}
 }
@@ -172,9 +173,22 @@ function make_bundle()
        	cd dist
 	    rm -rf $bundle_name 
 	    mkdir -p $bundle_name/bundle
-	    pushd diaspora
-	        bundle  install --deployment --path="../$bundle_name/bundle"  --without=test rdoc
-	       cp AUTHORS Gemfile GNU-AGPL-3.0 COPYRIGHT "../$bundle_name"
+	    pushd diaspora > /dev/null
+set -x
+                rm -rf devise.tmp
+                git clone http://github.com/BadMinus/devise.git devise.tmp
+                ( cd devise.tmp; gem build devise.gemspec)
+                gem install --install-dir "../$bundle_name/bundle/ruby/1.8" \
+                            --no-rdoc --no-ri                      \
+                            --ignore-dependencies                  \
+                            devise.tmp/devise-1.1.rc1.gem  &&
+                   rm -rf devise.tmp
+
+	        bundle install --deployment                      \
+                               --path="../$bundle_name/bundle"   \
+                               --without=test rdoc
+
+	        cp AUTHORS Gemfile GNU-AGPL-3.0 COPYRIGHT "../$bundle_name"
             popd
             tar czf $bundle_name.tar.gz $bundle_name
     }
@@ -211,11 +225,13 @@ function make_links()
 function usage()
 {
     	cat <<- EOF
-		Usage: make_dist [-c commit] <dist|bundle|fix_gemlock>
+
+		Usage: make_dist [-c commit] <dist|bundle|links>
+
 		-c             Use a given commit, defaults to last checked in.
 		dist           Build a diaspora application tarball.
 		bundle         Build a bundler(1) bundle for diaspora.
-		fix_gemlock    Try to fix out-of order gemlock, VERY INTRUSIVE.
+		links          Symlink bundle and source tarballs to rpm sourde dir.
 		
 		All results are stored in dist/
 	EOF

From ec9580aaf7553341a07743210d9bfd0aee19f4f3 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 6 Oct 2010 04:37:03 +0200
Subject: [PATCH 13/32] provisionary

---
 pkg/fedora/README.fedora | 19 ++++++++++++++++++-
 pkg/fedora/diaspora.spec | 12 +-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkg/fedora/README.fedora b/pkg/fedora/README.fedora
index a0990367e..fc3c8b61e 100644
--- a/pkg/fedora/README.fedora
+++ b/pkg/fedora/README.fedora
@@ -1 +1,18 @@
-TBD
+Here is tools to package diaspora as a RPM package.
+
+Synopsis:
+
+# Create dist/diaspora-0.0-1010041233_faded4231.tar.gz
+% ./make_dist.sh source
+
+# Create dist/diaspora-bundle-0.0-1010041233_faded4231.tar.gz
+% ./make_dist.sh bundle
+
+# Setup links to tarballs from RPM source directory:
+% ./make_dist.sh links
+
+# Build rpms:
+rpmbuild -ba dist/diaspora.spec
+rpmbuild-ba dist/diaspora-bundle.spec
+
+Routines uses last available version from master branch at github.
diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
index 6adab3db1..8ef7ba5eb 100644
--- a/pkg/fedora/diaspora.spec
+++ b/pkg/fedora/diaspora.spec
@@ -1,13 +1,3 @@
-# 
-#  Build diaspora RPM package.
-#
-#  Packages current HEAD if the diaspora master branch
-#  to a reasonable Fedora RPM.
-#
-#  If the environment variable GIT_VERSION is set, builds an rpm
-#  from this version (i. e., uses this commit).
-#
-
 %global         debug_package %{nil} 
 %define         git_release     HEAD
 
@@ -41,7 +31,7 @@ open source social network server.
 getent group diaspora >/dev/null || groupadd -r diaspora
 getent passwd diaspora >/dev/null ||       \
     useradd -r -g diaspora                 \
-    -md /var/lib/diaspora -s /sbin/nologin \
+    -md /usr/share/diaspora -s /sbin/nologin \
     -c "Diaspora daemon" diaspora
 exit 0
 

From d172a8ff7f7142520b581b843c4ce93a49461792 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 6 Oct 2010 05:01:32 +0200
Subject: [PATCH 14/32] provisionary

---
 pkg/fedora/diaspora.spec  |  15 ++---
 pkg/fedora/perm-fix.patch | 120 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 125 insertions(+), 10 deletions(-)
 create mode 100644 pkg/fedora/perm-fix.patch

diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
index 8ef7ba5eb..34c221a0f 100644
--- a/pkg/fedora/diaspora.spec
+++ b/pkg/fedora/diaspora.spec
@@ -16,6 +16,9 @@ BuildArch:	noarch
 # See http://github.com/diaspora/diaspora/issues/issue/393
 Patch0:		source-fix.patch
 
+# See: http://github.com/diaspora/diaspora/issues/issue/392
+Patch1:         perm-fix.patch
+
 BuildRequires:  git
 
 Requires(pre):  shadow-utils
@@ -39,20 +42,12 @@ exit 0
 %setup -q -n %{name}-%{version}-%{git_release}
 pushd master 
 %patch0 -p1
+git apply %{_sourcedir}/perm-fix.patch
 popd
-
-
 mkdir master/tmp || :
-#find . -name .git  | xargs rm -rf || :
-find . -type f -exec \
+find .  -perm /u+x -type f -exec \
     sed -i 's|^#!/usr/local/bin/ruby|#!/usr/bin/ruby|' {} \; > /dev/null
 
-# Patch request: http://github.com/diaspora/diaspora/issues/issue/392
-find . -name \*.css -print0 | xargs --null chmod 644
-find . -name \*.js  -print0 | xargs --null chmod 644
-chmod 644 master/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg
-chmod 644 master/public/stylesheets/brandongrotesque_light/demo.html
-
 %build
 rm -rf master/vendor/bundle
 pushd  master
diff --git a/pkg/fedora/perm-fix.patch b/pkg/fedora/perm-fix.patch
new file mode 100644
index 000000000..b6fabed52
--- /dev/null
+++ b/pkg/fedora/perm-fix.patch
@@ -0,0 +1,120 @@
+diff --git a/public/javascripts/fancybox/blank.gif b/public/javascripts/fancybox/blank.gif
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_close.png b/public/javascripts/fancybox/fancy_close.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_loading.png b/public/javascripts/fancybox/fancy_loading.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_nav_left.png b/public/javascripts/fancybox/fancy_nav_left.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_nav_right.png b/public/javascripts/fancybox/fancy_nav_right.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_e.png b/public/javascripts/fancybox/fancy_shadow_e.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_n.png b/public/javascripts/fancybox/fancy_shadow_n.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_ne.png b/public/javascripts/fancybox/fancy_shadow_ne.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_nw.png b/public/javascripts/fancybox/fancy_shadow_nw.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_s.png b/public/javascripts/fancybox/fancy_shadow_s.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_se.png b/public/javascripts/fancybox/fancy_shadow_se.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_sw.png b/public/javascripts/fancybox/fancy_shadow_sw.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_shadow_w.png b/public/javascripts/fancybox/fancy_shadow_w.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_title_left.png b/public/javascripts/fancybox/fancy_title_left.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_title_main.png b/public/javascripts/fancybox/fancy_title_main.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_title_over.png b/public/javascripts/fancybox/fancy_title_over.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancy_title_right.png b/public/javascripts/fancybox/fancy_title_right.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancybox-x.png b/public/javascripts/fancybox/fancybox-x.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancybox-y.png b/public/javascripts/fancybox/fancybox-y.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/fancybox.png b/public/javascripts/fancybox/fancybox.png
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/jquery.easing-1.3.pack.js b/public/javascripts/fancybox/jquery.easing-1.3.pack.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.css b/public/javascripts/fancybox/jquery.fancybox-1.3.1.css
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.js b/public/javascripts/fancybox/jquery.fancybox-1.3.1.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js b/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js b/public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/fileuploader.js b/public/javascripts/fileuploader.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/jquery.cycle/jquery.cycle.lite.min.js b/public/javascripts/jquery.cycle/jquery.cycle.lite.min.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/jquery.infieldlabel.js b/public/javascripts/jquery.infieldlabel.js
+old mode 100755
+new mode 100644
+diff --git a/public/javascripts/web_socket.js b/public/javascripts/web_socket.js
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/blueprint/src/grid.css b/public/stylesheets/blueprint/src/grid.css
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/blueprint/src/print.css b/public/stylesheets/blueprint/src/print.css
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/blueprint/src/reset.css b/public/stylesheets/blueprint/src/reset.css
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.eot b/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.eot
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg b/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.ttf b/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.ttf
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.woff b/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.woff
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/brandongrotesque_light/demo.html b/public/stylesheets/brandongrotesque_light/demo.html
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/brandongrotesque_light/stylesheet.css b/public/stylesheets/brandongrotesque_light/stylesheet.css
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/fileuploader.css b/public/stylesheets/fileuploader.css
+old mode 100755
+new mode 100644
+diff --git a/public/stylesheets/loading.gif b/public/stylesheets/loading.gif
+old mode 100755
+new mode 100644

From 03dbe0bb13828a7b7b0bd273ded1b3b93fd5f834 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 6 Oct 2010 18:53:41 +0200
Subject: [PATCH 15/32] New workflow w 'rake db:seed:dev'. Permissions on
 logfiles, logrotate conf. README update

---
 pkg/fedora/README.fedora    | 59 ++++++++++++++++++++++++++++++-------
 pkg/fedora/diaspora-setup   | 31 +++++++++++++++++++
 pkg/fedora/diaspora.logconf |  3 +-
 pkg/fedora/diaspora.spec    | 41 +++++++++++++-------------
 4 files changed, 102 insertions(+), 32 deletions(-)
 create mode 100755 pkg/fedora/diaspora-setup

diff --git a/pkg/fedora/README.fedora b/pkg/fedora/README.fedora
index fc3c8b61e..fdcd00448 100644
--- a/pkg/fedora/README.fedora
+++ b/pkg/fedora/README.fedora
@@ -1,18 +1,55 @@
-Here is tools to package diaspora as a RPM package.
+## Diaspora RPM tools
 
-Synopsis:
+Creates Fedora 13 RPM packages from diaspora git repository.
 
-# Create dist/diaspora-0.0-1010041233_faded4231.tar.gz
-% ./make_dist.sh source
+#### Synopsis:
 
-# Create dist/diaspora-bundle-0.0-1010041233_faded4231.tar.gz
-% ./make_dist.sh bundle
+    # Create dist/diaspora-0.0-1010041233_fade4231.tar.gz
+    % ./make_dist.sh source
 
-# Setup links to tarballs from RPM source directory:
-% ./make_dist.sh links
+    # Create dist/diaspora-bundle-0.0-1010041233_fade4231.tar.gz
+    % ./make_dist.sh bundle
 
-# Build rpms:
-rpmbuild -ba dist/diaspora.spec
-rpmbuild-ba dist/diaspora-bundle.spec
+    # Setup links to tarballs from RPM source directory:
+    % ./make_dist.sh links
+
+    # Build rpms:
+    rpmbuild -ba dist/diaspora.spec
+    rpmbuild -ba dist/diaspora-bundle.spec
+
+    #Install
+    rpm -U ~/rmpbuild/rpms/i686/diaspora-bundle-0.0-1.1010042345_4343fade43.fc13.i686
+    rpm -U ~/rmpbuild/rpms/noarch/diaspora-0.0-1.1010042345_4343fade43.fc13.noarch
+
+    #Initiate (as root)
+    /usr/sbin/diaspora-setup
+    # Fix hostname afterwards by editing pod_url in
+    # /usr/share/diaspora/master/config/app_config.yml
+
+
+    # Start development server:
+    sudo
+    su - diaspora
+    cd master
+    ./script/server
+
+    # Start using apache passenger:
+    # See: http://github.com/diaspora/diaspora/wiki/Using-apache
+    
+#### Notes
 
 Routines uses last available version from master branch at github.
+
+You need to copy all patches and secondary sources in this dir to
+the rpm source directory a. k. a. $(rpm --eval %_sourcedir).
+
+The spec-files in dist/ are patched by ./make_dist.sh source to reference
+correct versions of diaspora and diaspora-bundle. The diaspora-bundle
+is only updated if Gemfile is updated, upgrading diaspora doesn't 
+always require a new diaspora-bundle.
+
+rpmlint shows many errors, most of which related to that the server
+won't start if the .git directories are not included. Needs investigation.
+
+This has been confirmed to start up and provide basic functionality both using 
+the thin webserver and apache passenger.
diff --git a/pkg/fedora/diaspora-setup b/pkg/fedora/diaspora-setup
new file mode 100755
index 000000000..84ac0763c
--- /dev/null
+++ b/pkg/fedora/diaspora-setup
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# Do what's needed to initiate diaspora.
+#
+# See http://github.com/diaspora/diaspora/issues/issue/395
+
+test $UID = "0" || {
+    echo "You need to be root to do this, giving up"
+    exit 2
+}
+
+cd /usr/share/diaspora/master
+
+if rake --trace db:seed:dev; then
+   cat <<- EOF
+	Database config OK, new user tom/evanhort in place.
+	You might want to edit /usr/share/diaspora/master/config/app_config.yml
+	and change the pod_url to this host's hostname.
+	EOF
+else
+   cat <<- EOF
+	Database config failed. You might want to remove all db files with
+	rm -rf /var/lib/mongodb/* and giv it a new try.
+	EOF
+fi
+
+
+
+    
+
+
diff --git a/pkg/fedora/diaspora.logconf b/pkg/fedora/diaspora.logconf
index e51c705ed..48eca3916 100644
--- a/pkg/fedora/diaspora.logconf
+++ b/pkg/fedora/diaspora.logconf
@@ -1,4 +1,5 @@
 /var/log/diaspora/*.log {
+       create 755 diaspora apache
        weekly
        rotate 10
        copytruncate
@@ -7,6 +8,6 @@
        notifempty
        missingok
        postrotate
- 	  (/sbin/service diaspora-ws status | grep running /sbin/servive diaspora-ws restart || :)  >/dev/null 2>&1
+ 	  ( /sbin/service diaspora-ws condrestart )  >/dev/null 2>&1
        endscript
 }
diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
index 34c221a0f..fb06da654 100644
--- a/pkg/fedora/diaspora.spec
+++ b/pkg/fedora/diaspora.spec
@@ -11,13 +11,11 @@ URL:            http://www.joindiaspora.com/
 Vendor:         joindiaspora.com
 Source:         %{name}-%{version}-%{git_release}.tar.gz
 Source1:        diaspora-ws
-BuildArch:	noarch
+Source2:        diaspora-setup
+BuildArch:      noarch
 
 # See http://github.com/diaspora/diaspora/issues/issue/393
-Patch0:		source-fix.patch
-
-# See: http://github.com/diaspora/diaspora/issues/issue/392
-Patch1:         perm-fix.patch
+Patch0:         source-fix.patch
 
 BuildRequires:  git
 
@@ -30,32 +28,33 @@ Requires:       diaspora-bundle = %{version}
 A privacy aware, personally controlled, do-it-all and
 open source social network server.
 
-%pre
-getent group diaspora >/dev/null || groupadd -r diaspora
-getent passwd diaspora >/dev/null ||       \
-    useradd -r -g diaspora                 \
-    -md /usr/share/diaspora -s /sbin/nologin \
-    -c "Diaspora daemon" diaspora
-exit 0
-
 %prep
 %setup -q -n %{name}-%{version}-%{git_release}
 pushd master 
 %patch0 -p1
+
+# See: http://github.com/diaspora/diaspora/issues/issue/392
 git apply %{_sourcedir}/perm-fix.patch
 popd
-mkdir master/tmp || :
 find .  -perm /u+x -type f -exec \
     sed -i 's|^#!/usr/local/bin/ruby|#!/usr/bin/ruby|' {} \; > /dev/null
 
 %build
 rm -rf master/vendor/bundle
+mkdir master/tmp || :
 pushd  master
     tar cf public/source.tar  --exclude='source.tar' -X .gitignore *
 popd
 
-%install
+%pre
+getent group apache >/dev/null || groupadd -r apache
+getent passwd diaspora >/dev/null ||       \
+    useradd -r -g apache                 \
+    -md /usr/share/diaspora -s /sbin/nologin \
+    -c "Diaspora daemon" diaspora
+exit 0
 
+%install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
 cp master/README.md .
@@ -72,10 +71,12 @@ cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora
 cp master/.gitignore $RPM_BUILD_ROOT/%{_datadir}/diaspora/master
 
 %post
-/bin/chown diaspora:diaspora %{_localstatedir}/log/diaspora
-ln -sf  %{_localstatedir}/log/diaspora \
+rm -f  %{_datadir}/diaspora/master/vendor/bundle
+rm -f  %{_datadir}/diaspora/master/log
+
+ln -s  %{_localstatedir}/log/diaspora \
         %{_datadir}/diaspora/master/log || :
-ln -sf %{_libdir}/diaspora-bundle/master/vendor/bundle \
+ln -s  %{_libdir}/diaspora-bundle/master/vendor/bundle \
        %{_datadir}/diaspora/master/vendor || :
 /sbin/chkconfig --add  diaspora-ws
 
@@ -91,8 +92,8 @@ fi
 %files
 %defattr(-, root, root, 0755)
 %doc  README.md GNU-AGPL-3.0
-%{_datadir}/diaspora
-%{_localstatedir}/log/diaspora
+%attr(0555, diaspora, apache) %{_datadir}/diaspora
+%attr(0755, diaspora, apache) %{_localstatedir}/log/diaspora
 %config(noreplace) %{_sysconfdir}/logrotate.d/diaspora
 %{_sysconfdir}/init.d/diaspora-ws
 

From 28d6d418d78b116a0d2299e06d52370580fabff4 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 6 Oct 2010 18:56:46 +0200
Subject: [PATCH 16/32] renaimng README, to see it properly on github

---
 pkg/fedora/README.md | 55 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 pkg/fedora/README.md

diff --git a/pkg/fedora/README.md b/pkg/fedora/README.md
new file mode 100644
index 000000000..fdcd00448
--- /dev/null
+++ b/pkg/fedora/README.md
@@ -0,0 +1,55 @@
+## Diaspora RPM tools
+
+Creates Fedora 13 RPM packages from diaspora git repository.
+
+#### Synopsis:
+
+    # Create dist/diaspora-0.0-1010041233_fade4231.tar.gz
+    % ./make_dist.sh source
+
+    # Create dist/diaspora-bundle-0.0-1010041233_fade4231.tar.gz
+    % ./make_dist.sh bundle
+
+    # Setup links to tarballs from RPM source directory:
+    % ./make_dist.sh links
+
+    # Build rpms:
+    rpmbuild -ba dist/diaspora.spec
+    rpmbuild -ba dist/diaspora-bundle.spec
+
+    #Install
+    rpm -U ~/rmpbuild/rpms/i686/diaspora-bundle-0.0-1.1010042345_4343fade43.fc13.i686
+    rpm -U ~/rmpbuild/rpms/noarch/diaspora-0.0-1.1010042345_4343fade43.fc13.noarch
+
+    #Initiate (as root)
+    /usr/sbin/diaspora-setup
+    # Fix hostname afterwards by editing pod_url in
+    # /usr/share/diaspora/master/config/app_config.yml
+
+
+    # Start development server:
+    sudo
+    su - diaspora
+    cd master
+    ./script/server
+
+    # Start using apache passenger:
+    # See: http://github.com/diaspora/diaspora/wiki/Using-apache
+    
+#### Notes
+
+Routines uses last available version from master branch at github.
+
+You need to copy all patches and secondary sources in this dir to
+the rpm source directory a. k. a. $(rpm --eval %_sourcedir).
+
+The spec-files in dist/ are patched by ./make_dist.sh source to reference
+correct versions of diaspora and diaspora-bundle. The diaspora-bundle
+is only updated if Gemfile is updated, upgrading diaspora doesn't 
+always require a new diaspora-bundle.
+
+rpmlint shows many errors, most of which related to that the server
+won't start if the .git directories are not included. Needs investigation.
+
+This has been confirmed to start up and provide basic functionality both using 
+the thin webserver and apache passenger.

From 1ec99d2839fc9a24c526419f7166e674a12795a3 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 6 Oct 2010 19:04:25 +0200
Subject: [PATCH 17/32] EADME layout

---
 pkg/fedora/README.fedora | 55 ----------------------------------------
 pkg/fedora/README.md     | 23 ++++++++---------
 2 files changed, 11 insertions(+), 67 deletions(-)
 delete mode 100644 pkg/fedora/README.fedora

diff --git a/pkg/fedora/README.fedora b/pkg/fedora/README.fedora
deleted file mode 100644
index fdcd00448..000000000
--- a/pkg/fedora/README.fedora
+++ /dev/null
@@ -1,55 +0,0 @@
-## Diaspora RPM tools
-
-Creates Fedora 13 RPM packages from diaspora git repository.
-
-#### Synopsis:
-
-    # Create dist/diaspora-0.0-1010041233_fade4231.tar.gz
-    % ./make_dist.sh source
-
-    # Create dist/diaspora-bundle-0.0-1010041233_fade4231.tar.gz
-    % ./make_dist.sh bundle
-
-    # Setup links to tarballs from RPM source directory:
-    % ./make_dist.sh links
-
-    # Build rpms:
-    rpmbuild -ba dist/diaspora.spec
-    rpmbuild -ba dist/diaspora-bundle.spec
-
-    #Install
-    rpm -U ~/rmpbuild/rpms/i686/diaspora-bundle-0.0-1.1010042345_4343fade43.fc13.i686
-    rpm -U ~/rmpbuild/rpms/noarch/diaspora-0.0-1.1010042345_4343fade43.fc13.noarch
-
-    #Initiate (as root)
-    /usr/sbin/diaspora-setup
-    # Fix hostname afterwards by editing pod_url in
-    # /usr/share/diaspora/master/config/app_config.yml
-
-
-    # Start development server:
-    sudo
-    su - diaspora
-    cd master
-    ./script/server
-
-    # Start using apache passenger:
-    # See: http://github.com/diaspora/diaspora/wiki/Using-apache
-    
-#### Notes
-
-Routines uses last available version from master branch at github.
-
-You need to copy all patches and secondary sources in this dir to
-the rpm source directory a. k. a. $(rpm --eval %_sourcedir).
-
-The spec-files in dist/ are patched by ./make_dist.sh source to reference
-correct versions of diaspora and diaspora-bundle. The diaspora-bundle
-is only updated if Gemfile is updated, upgrading diaspora doesn't 
-always require a new diaspora-bundle.
-
-rpmlint shows many errors, most of which related to that the server
-won't start if the .git directories are not included. Needs investigation.
-
-This has been confirmed to start up and provide basic functionality both using 
-the thin webserver and apache passenger.
diff --git a/pkg/fedora/README.md b/pkg/fedora/README.md
index fdcd00448..f2d77ed1d 100644
--- a/pkg/fedora/README.md
+++ b/pkg/fedora/README.md
@@ -4,44 +4,43 @@ Creates Fedora 13 RPM packages from diaspora git repository.
 
 #### Synopsis:
 
-    # Create dist/diaspora-0.0-1010041233_fade4231.tar.gz
+Create source tarballs like  dist/diaspor0a-0.0-1010041233_fade4231.tar.gz  
+and dist/diaspora-bundle-0.0-1010041233_fade4231.tar.gz
     % ./make_dist.sh source
-
-    # Create dist/diaspora-bundle-0.0-1010041233_fade4231.tar.gz
     % ./make_dist.sh bundle
 
-    # Setup links to tarballs from RPM source directory:
+Setup links to tarballs from RPM source directory:
     % ./make_dist.sh links
 
-    # Build rpms:
+Build rpms:
     rpmbuild -ba dist/diaspora.spec
     rpmbuild -ba dist/diaspora-bundle.spec
 
-    #Install
+Install
     rpm -U ~/rmpbuild/rpms/i686/diaspora-bundle-0.0-1.1010042345_4343fade43.fc13.i686
     rpm -U ~/rmpbuild/rpms/noarch/diaspora-0.0-1.1010042345_4343fade43.fc13.noarch
 
-    #Initiate (as root)
+Initiate (as root)
     /usr/sbin/diaspora-setup
     # Fix hostname afterwards by editing pod_url in
     # /usr/share/diaspora/master/config/app_config.yml
 
-
-    # Start development server:
+Start development server:
     sudo
     su - diaspora
     cd master
     ./script/server
 
-    # Start using apache passenger:
-    # See: http://github.com/diaspora/diaspora/wiki/Using-apache
+Start using apache passenger:
+See: [[http://github.com/diaspora/diaspora/wiki/Using-apache]]
     
 #### Notes
 
 Routines uses last available version from master branch at github.
 
 You need to copy all patches and secondary sources in this dir to
-the rpm source directory a. k. a. $(rpm --eval %_sourcedir).
+the rpm source directory a. k. a. $(rpm --eval %_sourcedir). This
+includes some hidden .* files.
 
 The spec-files in dist/ are patched by ./make_dist.sh source to reference
 correct versions of diaspora and diaspora-bundle. The diaspora-bundle

From 7a50d537da70e7b8e35bc5ce8eefe266932b2014 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 6 Oct 2010 19:09:51 +0200
Subject: [PATCH 18/32] README wrapup

---
 pkg/fedora/README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkg/fedora/README.md b/pkg/fedora/README.md
index f2d77ed1d..35535bd79 100644
--- a/pkg/fedora/README.md
+++ b/pkg/fedora/README.md
@@ -4,7 +4,7 @@ Creates Fedora 13 RPM packages from diaspora git repository.
 
 #### Synopsis:
 
-Create source tarballs like  dist/diaspor0a-0.0-1010041233_fade4231.tar.gz  
+Create source tarballs like  dist/diaspora-0.0-1010041233_fade4231.tar.gz  
 and dist/diaspora-bundle-0.0-1010041233_fade4231.tar.gz
     % ./make_dist.sh source
     % ./make_dist.sh bundle
@@ -36,7 +36,9 @@ See: [[http://github.com/diaspora/diaspora/wiki/Using-apache]]
     
 #### Notes
 
-Routines uses last available version from master branch at github.
+Routines uses last available version from master branch at github. The
+version contains a time stamp and an abbreviated git commit id. If listed
+in filename order, like ls does, latest version will be the last one.
 
 You need to copy all patches and secondary sources in this dir to
 the rpm source directory a. k. a. $(rpm --eval %_sourcedir). This
@@ -45,7 +47,8 @@ includes some hidden .* files.
 The spec-files in dist/ are patched by ./make_dist.sh source to reference
 correct versions of diaspora and diaspora-bundle. The diaspora-bundle
 is only updated if Gemfile is updated, upgrading diaspora doesn't 
-always require a new diaspora-bundle.
+always require a new diaspora-bundle. Editing spec files should be done
+in this directory, changes in dist/ are lost when doing ./make_dist source.
 
 rpmlint shows many errors, most of which related to that the server
 won't start if the .git directories are not included. Needs investigation.

From e235c6b53731a954455e761c070912c7aa022023 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 6 Oct 2010 19:12:56 +0200
Subject: [PATCH 19/32] linking

---
 pkg/fedora/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/fedora/README.md b/pkg/fedora/README.md
index 35535bd79..bd9a99ad4 100644
--- a/pkg/fedora/README.md
+++ b/pkg/fedora/README.md
@@ -32,7 +32,7 @@ Start development server:
     ./script/server
 
 Start using apache passenger:
-See: [[http://github.com/diaspora/diaspora/wiki/Using-apache]]
+See: http://github.com/diaspora/diaspora/wiki/Using-apache
     
 #### Notes
 

From 9c14be8b11c1f5954596ec41322c4ad37ed69f00 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 6 Oct 2010 19:17:35 +0200
Subject: [PATCH 20/32] prerequisites

---
 pkg/fedora/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/fedora/README.md b/pkg/fedora/README.md
index bd9a99ad4..4a85a9164 100644
--- a/pkg/fedora/README.md
+++ b/pkg/fedora/README.md
@@ -4,6 +4,9 @@ Creates Fedora 13 RPM packages from diaspora git repository.
 
 #### Synopsis:
 
+Prerequisites: rub-1.8, rubygem and other packages as described in
+http://github.com/diaspora/diaspora/wiki/Rpm-installation-on-fedora
+
 Create source tarballs like  dist/diaspora-0.0-1010041233_fade4231.tar.gz  
 and dist/diaspora-bundle-0.0-1010041233_fade4231.tar.gz
     % ./make_dist.sh source

From 8ab97fe3f1015bf033cdf1e01884f5775d2ed4a0 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 6 Oct 2010 21:53:24 +0200
Subject: [PATCH 21/32] apache setup update, new diaspora-init

---
 pkg/fedora/README.md      | 41 ++++++++++++++++++++++++++++++---------
 pkg/fedora/diaspora-setup | 34 ++++++++++++++++++++++++--------
 pkg/fedora/diaspora.spec  |  1 +
 pkg/fedora/make_dist.sh   |  3 +--
 4 files changed, 60 insertions(+), 19 deletions(-)

diff --git a/pkg/fedora/README.md b/pkg/fedora/README.md
index 4a85a9164..09946e10e 100644
--- a/pkg/fedora/README.md
+++ b/pkg/fedora/README.md
@@ -1,10 +1,13 @@
 ## Diaspora RPM tools
 
-Creates Fedora 13 RPM packages from diaspora git repository.
+Creates RPM packages from diaspora git repository.  
+
+An alternative to the capistrano system, providing classic, binary RPM 
+packages for deployment on Fedora 13.
 
 #### Synopsis:
 
-Prerequisites: rub-1.8, rubygem and other packages as described in
+*Prerequisites*: ruby-1.8, rubygem and other packages as described in
 http://github.com/diaspora/diaspora/wiki/Rpm-installation-on-fedora
 
 Create source tarballs like  dist/diaspora-0.0-1010041233_fade4231.tar.gz  
@@ -23,10 +26,8 @@ Install
     rpm -U ~/rmpbuild/rpms/i686/diaspora-bundle-0.0-1.1010042345_4343fade43.fc13.i686
     rpm -U ~/rmpbuild/rpms/noarch/diaspora-0.0-1.1010042345_4343fade43.fc13.noarch
 
-Initiate (as root)
-    /usr/sbin/diaspora-setup
-    # Fix hostname afterwards by editing pod_url in
-    # /usr/share/diaspora/master/config/app_config.yml
+Initiate (as root). 
+    /usr/share/diaspora/diaspora-setup
 
 Start development server:
     sudo
@@ -34,9 +35,12 @@ Start development server:
     cd master
     ./script/server
 
-Start using apache passenger:
-See: http://github.com/diaspora/diaspora/wiki/Using-apache
-    
+See http://github.com/diaspora/diaspora/wiki/Using-apache for  
+apache/passenger setup. After configuration, start with:
+    /sbin/service diaspora-ws start
+    /sbin/service httpd restart
+
+
 #### Notes
 
 Routines uses last available version from master branch at github. The
@@ -58,3 +62,22 @@ won't start if the .git directories are not included. Needs investigation.
 
 This has been confirmed to start up and provide basic functionality both using 
 the thin webserver and apache passenger.
+
+#### Implementation
+
+
+'make_dist.sh source'  script checks out latest version of diaspora into the
+ dist/diaspora directory. This content is, after some patches, the diaspora package.
+
+'make-dir.sh bundle' makes a 'bundle install --deployment' in the diaspora dir.
+The resulting bundle is stored in vendor/bundle. This is, after some more 
+patches, the content of diaspora-bundle.
+
+Here is also support for running the diaspora websocket service as a system 
+service through /sbin/service and some install scripts.
+    
+Diaspora files are stored in /usr/share/diaspora, and owned by diaspora. The
+bundle, containing some C extensions, is architecture-dependent and lives
+in /usr/lib[64]/diaspora. Log files are in /var/log/diaspora. Symlinks in
+/usr/share diaspora makes log and bundle available as expected by diaspora app.
+This is more or less as mandated by LSB and Fedora packaging rules.
diff --git a/pkg/fedora/diaspora-setup b/pkg/fedora/diaspora-setup
index 84ac0763c..e97bc0d11 100755
--- a/pkg/fedora/diaspora-setup
+++ b/pkg/fedora/diaspora-setup
@@ -3,6 +3,9 @@
 # Do what's needed to initiate diaspora.
 #
 # See http://github.com/diaspora/diaspora/issues/issue/395
+#
+# Note: This is really sort of prototyping. This should be done in ruby,
+# on a web page.
 
 test $UID = "0" || {
     echo "You need to be root to do this, giving up"
@@ -11,19 +14,34 @@ test $UID = "0" || {
 
 cd /usr/share/diaspora/master
 
-if rake --trace db:seed:dev; then
-   cat <<- EOF
-	Database config OK, new user tom/evanhort in place.
-	You might want to edit /usr/share/diaspora/master/config/app_config.yml
-	and change the pod_url to this host's hostname.
-	EOF
+if rake db:seed:dev; then
+    echo "Database config OK, new user tom/evankort in place"
 else
-   cat <<- EOF
+    cat <<- EOF
+
 	Database config failed. You might want to remove all db files with
-	rm -rf /var/lib/mongodb/* and giv it a new try.
+	rm -rf /var/lib/mongodb/* and/or resetting the config file by
+	cp config/app_config.yml.example config/app_config.yml before
+	making a new try.
 	EOF
+    exit 1   
 fi
 
+hostname=$( awk '/pod_url:/ { print $2; exit }' <config/app_config.yml)
+while : ; do
+    echo "Current hostname is \"$hostname\""
+    echo -n "Enter new hostname [$hostname] :"
+    read new_hostname garbage
+    echo -n "Use hostname \"$new_hostname\" (Yes/No) [Yes]? :"
+    read yesno garbage
+    test -z "$yesno" && yesno='yes'
+    test ${yesno:0:1} = 'y' -o ${yesno:0:1} = 'Y' && {
+        sed -i "/pod_url:/s/$hostname/$new_hostname/g" config/app_config.yml &&
+            echo "config/app_config.yml updated."
+        break
+    }
+done
+
 
 
     
diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
index fb06da654..1fda16957 100644
--- a/pkg/fedora/diaspora.spec
+++ b/pkg/fedora/diaspora.spec
@@ -69,6 +69,7 @@ cp diaspora.logconf  $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/diaspora
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
 cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora
 cp master/.gitignore $RPM_BUILD_ROOT/%{_datadir}/diaspora/master
+cp diaspora-setup  $RPM_BUILD_ROOT/%{_datadir}/diaspora
 
 %post
 rm -f  %{_datadir}/diaspora/master/vendor/bundle
diff --git a/pkg/fedora/make_dist.sh b/pkg/fedora/make_dist.sh
index 7fbaea2aa..4a3586da3 100755
--- a/pkg/fedora/make_dist.sh
+++ b/pkg/fedora/make_dist.sh
@@ -139,8 +139,7 @@ function make_dist
     RELEASE_DIR="diaspora-$VERSION-$commit"
     rm -rf dist/${RELEASE_DIR} 
     mkdir dist/${RELEASE_DIR}
-    cp diaspora-ws    dist/${RELEASE_DIR}
-    cp diaspora.logconf  dist/${RELEASE_DIR}
+    cp diaspora-ws diaspora-setup diaspora.logconf dist/${RELEASE_DIR}
     cd dist
     mkdir ${RELEASE_DIR}/master
     cp -ar diaspora/*  diaspora/.git* ${RELEASE_DIR}/master	

From 09a931d4fd798af5a92fbe1cb8b58cda8ed9742a Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 6 Oct 2010 23:15:52 +0200
Subject: [PATCH 22/32] Addding uploads directory

---
 pkg/fedora/README.md      |  5 +++++
 pkg/fedora/diaspora-setup |  3 +++
 pkg/fedora/diaspora.spec  | 11 ++++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkg/fedora/README.md b/pkg/fedora/README.md
index 09946e10e..22bb4b032 100644
--- a/pkg/fedora/README.md
+++ b/pkg/fedora/README.md
@@ -81,3 +81,8 @@ bundle, containing some C extensions, is architecture-dependent and lives
 in /usr/lib[64]/diaspora. Log files are in /var/log/diaspora. Symlinks in
 /usr/share diaspora makes log and bundle available as expected by diaspora app.
 This is more or less as mandated by LSB and Fedora packaging rules.
+ 
+    find /usr/share/diaspora/ -type l -exec ls -l {} \; | awk '{print $9, $10, $11}'
+    /usr/share/diaspora/master/public/uploads -> /var/lib/diaspora/uploads
+    /usr/share/diaspora/master/log -> /var/log/diaspora
+    /usr/share/diaspora/master/vendor/bundle -> /usr/lib/diaspora-bundle/master/vendor/bundle
diff --git a/pkg/fedora/diaspora-setup b/pkg/fedora/diaspora-setup
index e97bc0d11..d4c275915 100755
--- a/pkg/fedora/diaspora-setup
+++ b/pkg/fedora/diaspora-setup
@@ -27,6 +27,9 @@ else
     exit 1   
 fi
 
+# %attr(0777, diaspora, apache) doesn't  work in specfile due to umask 022.
+chmod 777 /var/lib/diaspora/uploads
+
 hostname=$( awk '/pod_url:/ { print $2; exit }' <config/app_config.yml)
 while : ; do
     echo "Current hostname is \"$hostname\""
diff --git a/pkg/fedora/diaspora.spec b/pkg/fedora/diaspora.spec
index 1fda16957..318ab9523 100644
--- a/pkg/fedora/diaspora.spec
+++ b/pkg/fedora/diaspora.spec
@@ -47,7 +47,7 @@ pushd  master
 popd
 
 %pre
-getent group apache >/dev/null || groupadd -r apache
+getent group diaspora >/dev/null || groupadd -r diaspora
 getent passwd diaspora >/dev/null ||       \
     useradd -r -g apache                 \
     -md /usr/share/diaspora -s /sbin/nologin \
@@ -70,15 +70,19 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
 cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora
 cp master/.gitignore $RPM_BUILD_ROOT/%{_datadir}/diaspora/master
 cp diaspora-setup  $RPM_BUILD_ROOT/%{_datadir}/diaspora
+mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/uploads
 
 %post
 rm -f  %{_datadir}/diaspora/master/vendor/bundle
 rm -f  %{_datadir}/diaspora/master/log
+rm -f  %{_datadir}/diaspora/master/public/uploads
 
 ln -s  %{_localstatedir}/log/diaspora \
         %{_datadir}/diaspora/master/log || :
 ln -s  %{_libdir}/diaspora-bundle/master/vendor/bundle \
        %{_datadir}/diaspora/master/vendor || :
+ln -s  %{_localstatedir}/lib/diaspora/uploads \
+       %{_datadir}/diaspora/master/public/uploads || :
 /sbin/chkconfig --add  diaspora-ws
 
 %preun
@@ -93,8 +97,9 @@ fi
 %files
 %defattr(-, root, root, 0755)
 %doc  README.md GNU-AGPL-3.0
-%attr(0555, diaspora, apache) %{_datadir}/diaspora
-%attr(0755, diaspora, apache) %{_localstatedir}/log/diaspora
+%attr(0555, diaspora, diaspora) %{_datadir}/diaspora
+%attr(-, diaspora, diaspora) %{_localstatedir}/log/diaspora
+%attr(-, diaspora, diaspora) %{_localstatedir}/lib/diaspora/uploads
 %config(noreplace) %{_sysconfdir}/logrotate.d/diaspora
 %{_sysconfdir}/init.d/diaspora-ws
 

From 5bd5aea48443d4e5fc3d3d4cc3f332ad946efe8d Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 7 Oct 2010 01:42:33 +0200
Subject: [PATCH 23/32] make-dist handles commit arg OK, make-dist list links
 all sources. Smaller clean-ups.

---
 pkg/fedora/Gemfile.lock.patch |  13 ++
 pkg/fedora/SOURCES            |   7 +
 pkg/fedora/diaspora-setup     |   2 +-
 pkg/fedora/make-dist.sh       | 264 ++++++++++++++++++++++++++++++++++
 4 files changed, 285 insertions(+), 1 deletion(-)
 create mode 100644 pkg/fedora/Gemfile.lock.patch
 create mode 100644 pkg/fedora/SOURCES
 create mode 100755 pkg/fedora/make-dist.sh

diff --git a/pkg/fedora/Gemfile.lock.patch b/pkg/fedora/Gemfile.lock.patch
new file mode 100644
index 000000000..7b96c043e
--- /dev/null
+++ b/pkg/fedora/Gemfile.lock.patch
@@ -0,0 +1,13 @@
+diff --git a/Gemfile.lock b/Gemfile.lock
+index 8534f58..44d386e 100644
+--- a/Gemfile.lock
++++ b/Gemfile.lock
+@@ -258,7 +258,7 @@ DEPENDENCIES
+   autotest
+   bson (= 1.0.7)
+   bson_ext (= 1.0.7)
+-  bundler (= 1.0.0)
++  bundler (>= 1.0.0)
+   capybara (~> 0.3.9)
+   carrierwave!
+   cucumber-rails (= 0.3.2)
diff --git a/pkg/fedora/SOURCES b/pkg/fedora/SOURCES
new file mode 100644
index 000000000..4b487fdf5
--- /dev/null
+++ b/pkg/fedora/SOURCES
@@ -0,0 +1,7 @@
+# These files will be linked to %_sourcedir by 'make-dist links'
+.bundle
+diaspora-setup
+diaspora-ws
+Gemfile.patch
+perm-fix.patch
+source-fix.patch
diff --git a/pkg/fedora/diaspora-setup b/pkg/fedora/diaspora-setup
index d4c275915..e103e789d 100755
--- a/pkg/fedora/diaspora-setup
+++ b/pkg/fedora/diaspora-setup
@@ -27,7 +27,7 @@ else
     exit 1   
 fi
 
-# %attr(0777, diaspora, apache) doesn't  work in specfile due to umask 022.
+# %attr(0777, diaspora, diaspora) doesn't work in specfile due to umask 022.
 chmod 777 /var/lib/diaspora/uploads
 
 hostname=$( awk '/pod_url:/ { print $2; exit }' <config/app_config.yml)
diff --git a/pkg/fedora/make-dist.sh b/pkg/fedora/make-dist.sh
new file mode 100755
index 000000000..957db6fa7
--- /dev/null
+++ b/pkg/fedora/make-dist.sh
@@ -0,0 +1,264 @@
+#!/bin/bash
+
+#Usage: make_dist [-b] [-d] [s] [-c <commit>] 
+#
+# -b create a bundler bundle for diaspora
+# -d create a diaspora source tarball
+# -s synchronize Gemfile.lock VERY INTRUSIVE to RUBY ENVIRONMENT
+# -c Use a given commit instead of last available
+
+#
+# Create a diaspora distribution
+#
+# Builds a diaspora distribution containing the application and bundled
+# libraries. Normally checks out latest version of the master branch.
+#
+GIT_REPO='http://github.com/diaspora/diaspora.git'
+RELEASE='HEAD'
+VERSION='0.0'
+
+function git_id
+#
+# Echo package-friendly source id.
+#
+# Usage: git_id [-n] [file or directory]
+#
+{
+    nl="\n"
+    file_or_dir="$PWD"
+    test "$1" = '-n' && { nl=""; shift; }
+    test -n "$1" && file_or_dir="$1"
+    if [ -d $file_or_dir ]; then
+        file=""
+        dir=$file_or_dir
+    else
+        file=$(basename $file_or_dir) 
+        dir=$(dirname $file_or_dir)
+    fi    
+
+    export LANG=C
+    (
+        cd $dir
+        git log -1 --abbrev-commit --date=iso $file |
+        awk  -v nl="$nl" \
+         ' /commit/       { commit = $2 }
+           /Date/         { split( $2, d, "-")
+                            split( $3, t, ":")
+                          }
+           END            { printf( "%s%s%s%s%s_%s%s",
+                                substr( d[1],3), d[2], d[3],
+                                t[1], t[2],
+                                commit, nl)
+                          }'
+    )
+}
+
+
+function fix_alphatag()
+#  Patch version on top comment first id line:
+#  Uses %define git_release to get release.
+#* Fri Sep 24 2010 name surname  <email@com>     1.20100925_faf234320
+{
+    dist=$(rpm --eval %dist)
+    awk  -v dist="$dist" -v version="$2"  \
+        ' BEGIN         { done = 0 }
+          /%define/     { if ($2 = "git_release") release = $3 }
+          /^[*]/        { if (done)
+                             print
+                          else
+                          {
+                             gsub( "1[.].*", "")
+                             printf( "%s%s-1.%s%s\n", 
+                                     $0, version, release,dist)
+                             done = 1
+                          }
+                          next
+                        }
+                        { print }' \
+    < $1 > $1.tmp && cp $1.tmp $1 && rm $1.tmp
+}
+
+function fix_bundle_deps
+# usage: fix_bundle_deps <specfile> <version> release
+# Patches Requires:   diaspora-bundle = 0.0-20101021-aefsf323148
+{
+	awk -v vers="$2-$3" \
+		' /Requires:/ { if ($2 == "diaspora-bundle")
+				    printf( "%s	%s = %s\n", $1,$2,vers)
+				else
+				    print				    
+				next
+			       }
+			       { print}' \
+             < $1 > $1.tmp && cp $1.tmp $1 && rm $1.tmp			    
+}
+
+function patch()
+# Patch git_release, Requires: diaspora-bundle and top comment version.
+# Usage: patch VERSION RELEASE
+{
+	sed -e "/^%define/s|HEAD|$2|"                  \
+            -e '/^Version:/s|.*|Version:        '$1'|' \
+                <diaspora.spec >dist/diaspora.spec                              
+	fix_alphatag dist/diaspora.spec $1
+	#mkdir dist/diaspora/tmp || :
+	bundle_id=$(git_id dist/diaspora/Gemfile)
+	fix_bundle_deps  dist/diaspora.spec $1 "1.$bundle_id.fc13"
+	sed -e "/^%define/s|HEAD|$bundle_deps|"        \
+            -e '/^Version:/s|.*|Version:        '$1'|' \
+                < diaspora-bundle.spec > dist/diaspora-bundle.spec
+	
+	cp dist/diaspora.spec dist/diaspora/diaspora.spec
+}
+
+function checkout()
+# Checkout last version of diaspora unless it's already there.
+# Usage: checkout [commit id, defaults to HEAD]
+# Returns: commit for current branch's HEAD.
+{   
+    mkdir dist  >/dev/null 2>&1 || :
+    (
+        cd dist 
+        test -d diaspora || {
+             git clone --quiet $GIT_REPO; 
+             (
+                 cd diaspora;
+                 git remote add upstream \
+                     git://github.com/diaspora/diaspora.git
+             )
+        }
+        cd diaspora; 
+        git fetch --quiet upstream 
+        git merge --quiet upstream/master
+        git checkout --quiet -b dist ${1:-'HEAD'}
+        git_id  -n 
+    )
+}
+
+
+function make_dist
+# Create a distribution tarball
+{
+    commit=$(checkout ${1:-'HEAD'})
+    patch $VERSION $commit 
+	
+    RELEASE_DIR="diaspora-$VERSION-$commit"
+    rm -rf dist/${RELEASE_DIR} 
+    mkdir dist/${RELEASE_DIR}
+    cp diaspora-ws diaspora-setup diaspora.logconf dist/${RELEASE_DIR}
+    cd dist
+    mkdir ${RELEASE_DIR}/master
+    cp -ar diaspora/*  diaspora/.git* ${RELEASE_DIR}/master	
+    cp -r ../.bundle ${RELEASE_DIR}/master
+    mv  ${RELEASE_DIR}/master/diaspora.spec  ${RELEASE_DIR}
+    tar czf ${RELEASE_DIR}.tar.gz  ${RELEASE_DIR} && rm -rf ${RELEASE_DIR}
+}
+
+function make_bundle()
+{
+    checkout 'HEAD'
+    bundle_id=$(git_id dist/diaspora/Gemfile)
+    bundle_name="diaspora-bundle-$VERSION-$bundle_id"
+    test -e  "$bundle_name" || {
+       	cd dist
+	    rm -rf $bundle_name 
+	    mkdir -p $bundle_name/bundle
+	    pushd diaspora > /dev/null
+set -x
+                rm -rf devise.tmp
+                git clone http://github.com/BadMinus/devise.git devise.tmp
+                ( cd devise.tmp; gem build devise.gemspec)
+                gem install --install-dir "../$bundle_name/bundle/ruby/1.8" \
+                            --no-rdoc --no-ri                      \
+                            --ignore-dependencies                  \
+                            devise.tmp/devise-1.1.rc1.gem  &&
+                   rm -rf devise.tmp
+
+	        bundle install --deployment                      \
+                               --path="../$bundle_name/bundle"   \
+                               --without=test rdoc
+
+	        cp AUTHORS Gemfile GNU-AGPL-3.0 COPYRIGHT "../$bundle_name"
+            popd
+            tar czf $bundle_name.tar.gz $bundle_name
+    }
+}
+
+function make_links()
+# Usage: make_links [source commit]
+{
+    dest=$(rpm --eval %_sourcedir)
+    test -z "$dest" && {
+        echo "Can't find RPM source directory, giving up."
+        exit 2
+    }
+
+    src_commit="$1"
+    test -z "$src_commit" && {
+         src_commit=$(checkout)
+    }
+    src="dist/diaspora-$VERSION-$src_commit.tar.gz"
+    ln -sf $PWD/$src $dest
+
+    bundle_commit=$(git_id dist/diaspora/Gemfile)
+    bundle="dist/diaspora-bundle-$VERSION-$bundle_commit.tar.gz"
+    ln -sf $PWD/$bundle $dest
+    cd $dest
+    find . -type l -not -readable -exec rm {} \;
+}
+
+    
+  
+
+
+
+function usage()
+{
+    	cat <<- EOF
+
+		Usage: make_dist [-c commit] <dist|bundle|links>
+
+		-c             Use a given commit, defaults to last checked in.
+		dist           Build a diaspora application tarball.
+		bundle         Build a bundler(1) bundle for diaspora.
+		links          Symlink bundle and source tarballs to rpm sourde dir.
+		
+		All results are stored in dist/
+	EOF
+}		
+test "$1" = "-h"  -o $# = 0 && {
+    usage;
+    exit 0
+}
+
+test "$1" = "-c" && {
+    test-z "$2" && {
+        usage;
+        exit 1
+    }
+    commit="$2"
+    shift; shift
+}
+    
+    
+ case $1 in
+ 
+     "bundle")  make_bundle $commit
+                ;;
+     'source')    make_dist $commit
+                ;;
+
+     'links')   make_links $commit
+                ;;
+
+     "fix_gemfile")
+                fix_gemfile
+                ;;
+                
+            *)  usage
+                exit 1
+                ;;
+ esac
+ 
+         
+

From 876a32d64bcf52b162ebbc2f30c6ad9bf26cbceb Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 7 Oct 2010 01:48:44 +0200
Subject: [PATCH 24/32] make-dist handles commit arg, links handles all sources

---
 pkg/fedora/README.md      |  11 +-
 pkg/fedora/diaspora-setup |   3 +-
 pkg/fedora/make-dist.sh   |  51 ++++---
 pkg/fedora/make_dist.sh   | 273 --------------------------------------
 4 files changed, 37 insertions(+), 301 deletions(-)
 delete mode 100755 pkg/fedora/make_dist.sh

diff --git a/pkg/fedora/README.md b/pkg/fedora/README.md
index 22bb4b032..d5bd23fe9 100644
--- a/pkg/fedora/README.md
+++ b/pkg/fedora/README.md
@@ -12,11 +12,11 @@ http://github.com/diaspora/diaspora/wiki/Rpm-installation-on-fedora
 
 Create source tarballs like  dist/diaspora-0.0-1010041233_fade4231.tar.gz  
 and dist/diaspora-bundle-0.0-1010041233_fade4231.tar.gz
-    % ./make_dist.sh source
-    % ./make_dist.sh bundle
+    % ./make-dist.sh source
+    % ./make-dist.sh bundle
 
 Setup links to tarballs from RPM source directory:
-    % ./make_dist.sh links
+    % ./make-dist.sh links
 
 Build rpms:
     rpmbuild -ba dist/diaspora.spec
@@ -47,9 +47,8 @@ Routines uses last available version from master branch at github. The
 version contains a time stamp and an abbreviated git commit id. If listed
 in filename order, like ls does, latest version will be the last one.
 
-You need to copy all patches and secondary sources in this dir to
-the rpm source directory a. k. a. $(rpm --eval %_sourcedir). This
-includes some hidden .* files.
+*make-dist links* creates links  also for all files listed in SOURCES.
+Typically, this is patches and secondary sources.
 
 The spec-files in dist/ are patched by ./make_dist.sh source to reference
 correct versions of diaspora and diaspora-bundle. The diaspora-bundle
diff --git a/pkg/fedora/diaspora-setup b/pkg/fedora/diaspora-setup
index e103e789d..0df7ceb2f 100755
--- a/pkg/fedora/diaspora-setup
+++ b/pkg/fedora/diaspora-setup
@@ -37,8 +37,7 @@ while : ; do
     read new_hostname garbage
     echo -n "Use hostname \"$new_hostname\" (Yes/No) [Yes]? :"
     read yesno garbage
-    test -z "$yesno" && yesno='yes'
-    test ${yesno:0:1} = 'y' -o ${yesno:0:1} = 'Y' && {
+    test ${yesno:0:1} = 'y' -o ${yesno:0:1} = 'Y' -o -z "$yesno" && {
         sed -i "/pod_url:/s/$hostname/$new_hostname/g" config/app_config.yml &&
             echo "config/app_config.yml updated."
         break
diff --git a/pkg/fedora/make-dist.sh b/pkg/fedora/make-dist.sh
index 957db6fa7..6d0795618 100755
--- a/pkg/fedora/make-dist.sh
+++ b/pkg/fedora/make-dist.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
 
-#Usage: make_dist [-b] [-d] [s] [-c <commit>] 
+#Usage: See  function usage() at bottom.
 #
-# -b create a bundler bundle for diaspora
-# -d create a diaspora source tarball
-# -s synchronize Gemfile.lock VERY INTRUSIVE to RUBY ENVIRONMENT
-# -c Use a given commit instead of last available
-
 #
 # Create a diaspora distribution
 #
@@ -41,8 +36,9 @@ function git_id
         cd $dir
         git log -1 --abbrev-commit --date=iso $file |
         awk  -v nl="$nl" \
-         ' /commit/       { commit = $2 }
-           /Date/         { split( $2, d, "-")
+          ' BEGIN         { commit = "" }
+           /^commit/      { if ( commit ==  "") commit = $2 }
+           /^Date:/       { split( $2, d, "-")
                             split( $3, t, ":")
                           }
            END            { printf( "%s%s%s%s%s_%s%s",
@@ -130,7 +126,7 @@ function checkout()
         cd diaspora; 
         git fetch --quiet upstream 
         git merge --quiet upstream/master
-        git checkout --quiet -b dist ${1:-'HEAD'}
+        git checkout --quiet  ${1:-'HEAD'}
         git_id  -n 
     )
 }
@@ -140,6 +136,7 @@ function make_dist
 # Create a distribution tarball
 {
     commit=$(checkout ${1:-'HEAD'})
+    echo "Creating source tarball for $commit"
     patch $VERSION $commit 
 	
     RELEASE_DIR="diaspora-$VERSION-$commit"
@@ -152,19 +149,27 @@ function make_dist
     cp -r ../.bundle ${RELEASE_DIR}/master
     mv  ${RELEASE_DIR}/master/diaspora.spec  ${RELEASE_DIR}
     tar czf ${RELEASE_DIR}.tar.gz  ${RELEASE_DIR} && rm -rf ${RELEASE_DIR}
+    cd ..
+    bundle_id=$(git_id dist/diaspora/Gemfile)
+    echo "Source:           dist/${RELEASE_DIR}.tar.gz"
+    echo "Required bundle:  $bundle_id"
+    echo "Source specfile:  dist/diaspora.spec"
+    echo "Bundle specfile:  dist/diaspora-bundle.spec"
 }
 
 function make_bundle()
 {
-    checkout 'HEAD'
+    checkout ${1:-'HEAD'} >/dev/null
     bundle_id=$(git_id dist/diaspora/Gemfile)
     bundle_name="diaspora-bundle-$VERSION-$bundle_id"
-    test -e  "$bundle_name" || {
+    test -e  "dist/$bundle_name.tar.gz" || {
+        echo "Creating bundle $bundle_name"
        	cd dist
 	    rm -rf $bundle_name 
 	    mkdir -p $bundle_name/bundle
 	    pushd diaspora > /dev/null
-set -x
+                test -e ../../Gemfile.lock.patch &&
+		    git apply ../../Gemfile.lock.patch > /dev/null 2>&1
                 rm -rf devise.tmp
                 git clone http://github.com/BadMinus/devise.git devise.tmp
                 ( cd devise.tmp; gem build devise.gemspec)
@@ -182,6 +187,8 @@ set -x
             popd
             tar czf $bundle_name.tar.gz $bundle_name
     }
+    echo 
+    echo "Bundle: dist/$bundle_name.tar.gz"
 }
 
 function make_links()
@@ -192,6 +199,7 @@ function make_links()
         echo "Can't find RPM source directory, giving up."
         exit 2
     }
+    echo "Linking sources to $dest"
 
     src_commit="$1"
     test -z "$src_commit" && {
@@ -203,15 +211,15 @@ function make_links()
     bundle_commit=$(git_id dist/diaspora/Gemfile)
     bundle="dist/diaspora-bundle-$VERSION-$bundle_commit.tar.gz"
     ln -sf $PWD/$bundle $dest
+
+    for file in $( egrep -v '^#' SOURCES); do
+        ln -sf $PWD/$file $dest/$file
+    done
+
     cd $dest
     find . -type l -not -readable -exec rm {} \;
 }
 
-    
-  
-
-
-
 function usage()
 {
     	cat <<- EOF
@@ -221,18 +229,20 @@ function usage()
 		-c             Use a given commit, defaults to last checked in.
 		dist           Build a diaspora application tarball.
 		bundle         Build a bundler(1) bundle for diaspora.
-		links          Symlink bundle and source tarballs to rpm sourde dir.
+		links          Symlink bundle and source tarballs to rpm source dir.
 		
 		All results are stored in dist/
 	EOF
 }		
+
+
 test "$1" = "-h"  -o $# = 0 && {
     usage;
     exit 0
 }
 
 test "$1" = "-c" && {
-    test-z "$2" && {
+    test -z "$2" && {
         usage;
         exit 1
     }
@@ -245,7 +255,8 @@ test "$1" = "-c" && {
  
      "bundle")  make_bundle $commit
                 ;;
-     'source')    make_dist $commit
+
+     'source')  make_dist $commit
                 ;;
 
      'links')   make_links $commit
diff --git a/pkg/fedora/make_dist.sh b/pkg/fedora/make_dist.sh
deleted file mode 100755
index 4a3586da3..000000000
--- a/pkg/fedora/make_dist.sh
+++ /dev/null
@@ -1,273 +0,0 @@
-#!/bin/bash
-
-#Usage: make_dist [-b] [-d] [s] [-c <commit>] 
-#
-# -b create a bundler bundle for diaspora
-# -d create a diaspora source tarball
-# -s synchronize Gemfile.lock VERY INTRUSIVE to RUBY ENVIRONMENT
-# -c Use a given commit instead of last available
-
-#
-# Create a diaspora distribution
-#
-# Builds a diaspora distribution containing the application and bundled
-# libraries. Normally checks out latest version of the master branch.
-#
-GIT_REPO='http://github.com/diaspora/diaspora.git'
-RELEASE='HEAD'
-VERSION='0.0'
-
-function git_id
-#
-# Echo package-friendly source id.
-#
-# Usage: git_id [-n] [file or directory]
-#
-{
-    nl="\n"
-    file_or_dir="$PWD"
-    test "$1" = '-n' && { nl=""; shift; }
-    test -n "$1" && file_or_dir="$1"
-    if [ -d $file_or_dir ]; then
-        file=""
-        dir=$file_or_dir
-    else
-        file=$(basename $file_or_dir) 
-        dir=$(dirname $file_or_dir)
-    fi    
-
-    export LANG=C
-    (
-        cd $dir
-        git log -1 --abbrev-commit --date=iso $file |
-        awk  -v nl="$nl" \
-         ' /commit/       { commit = $2 }
-           /Date/         { split( $2, d, "-")
-                            split( $3, t, ":")
-                          }
-           END            { printf( "%s%s%s%s%s_%s%s",
-                                substr( d[1],3), d[2], d[3],
-                                t[1], t[2],
-                                commit, nl)
-                          }'
-    )
-}
-
-
-function fix_alphatag()
-#  Patch version on top comment first id line:
-#  Uses %define git_release to get release.
-#* Fri Sep 24 2010 name surname  <email@com>     1.20100925_faf234320
-{
-    dist=$(rpm --eval %dist)
-    awk  -v dist="$dist" -v version="$2"  \
-        ' BEGIN         { done = 0 }
-          /%define/     { if ($2 = "git_release") release = $3 }
-          /^[*]/        { if (done)
-                             print
-                          else
-                          {
-                             gsub( "1[.].*", "")
-                             printf( "%s%s-1.%s%s\n", 
-                                     $0, version, release,dist)
-                             done = 1
-                          }
-                          next
-                        }
-                        { print }' \
-    < $1 > $1.tmp && cp $1.tmp $1 && rm $1.tmp
-}
-
-function fix_bundle_deps
-# usage: fix_bundle_deps <specfile> <version> release
-# Patches Requires:   diaspora-bundle = 0.0-20101021-aefsf323148
-{
-	awk -v vers="$2-$3" \
-		' /Requires:/ { if ($2 == "diaspora-bundle")
-				    printf( "%s	%s = %s\n", $1,$2,vers)
-				else
-				    print				    
-				next
-			       }
-			       { print}' \
-             < $1 > $1.tmp && cp $1.tmp $1 && rm $1.tmp			    
-}
-
-function patch()
-# Patch git_release, Requires: diaspora-bundle and top comment version.
-# Usage: patch VERSION RELEASE
-{
-	sed -e "/^%define/s|HEAD|$2|"                  \
-            -e '/^Version:/s|.*|Version:        '$1'|' \
-                <diaspora.spec >dist/diaspora.spec                              
-	fix_alphatag dist/diaspora.spec $1
-	#mkdir dist/diaspora/tmp || :
-	bundle_id=$(git_id dist/diaspora/Gemfile)
-	fix_bundle_deps  dist/diaspora.spec $1 "1.$bundle_id.fc13"
-	sed -e "/^%define/s|HEAD|$bundle_deps|"        \
-            -e '/^Version:/s|.*|Version:        '$1'|' \
-                < diaspora-bundle.spec > dist/diaspora-bundle.spec
-	
-	cp dist/diaspora.spec dist/diaspora/diaspora.spec
-}
-
-function checkout()
-# Checkout last version of diaspora unless it's already there.
-# Returns: commit for current branch's HEAD.
-{   
-    mkdir dist  >/dev/null 2>&1 || :
-    (
-        cd dist 
-        test -d diaspora && {
-            ( cd diaspora; git_id -n)
-            return
-        }
-        git clone --quiet $GIT_REPO;      \
-        cd diaspora; 
-        git checkout --quiet -b dist $GIT_VERSION; 
-        git_id  -n 
-    )
-}
-
-
-function make_dist
-# Create a distribution tarball
-{
-    commit=$(checkout)
-    patch $VERSION $commit 
-	
-    RELEASE_DIR="diaspora-$VERSION-$commit"
-    rm -rf dist/${RELEASE_DIR} 
-    mkdir dist/${RELEASE_DIR}
-    cp diaspora-ws diaspora-setup diaspora.logconf dist/${RELEASE_DIR}
-    cd dist
-    mkdir ${RELEASE_DIR}/master
-    cp -ar diaspora/*  diaspora/.git* ${RELEASE_DIR}/master	
-    cp -r ../.bundle ${RELEASE_DIR}/master
-    mv  ${RELEASE_DIR}/master/diaspora.spec  ${RELEASE_DIR}
-    tar czf ${RELEASE_DIR}.tar.gz  ${RELEASE_DIR} && rm -rf ${RELEASE_DIR}
-}
-
-#set -x
-#mkdir dist || :
-#pushd dist
-#    test -d diaspora || {
-##         git clone  $GIT_REPO;      
-#         pushd diaspora
-#             git checkout -b dist $RELEASE;
-#	     git add upstream $GIT_REPO#
-#	 popd
-#    }
-#    pushd diaspora
-#        git fetch upstream
-#        git merge upstream/master
-#    popd
-#popd
-
-function make_bundle()
-{
-    bundle_id=$(git_id dist/diaspora/Gemfile)
-    bundle_name="diaspora-bundle-$VERSION-$bundle_id"
-    test -e  "$bundle_name" || {
-       	cd dist
-	    rm -rf $bundle_name 
-	    mkdir -p $bundle_name/bundle
-	    pushd diaspora > /dev/null
-set -x
-                rm -rf devise.tmp
-                git clone http://github.com/BadMinus/devise.git devise.tmp
-                ( cd devise.tmp; gem build devise.gemspec)
-                gem install --install-dir "../$bundle_name/bundle/ruby/1.8" \
-                            --no-rdoc --no-ri                      \
-                            --ignore-dependencies                  \
-                            devise.tmp/devise-1.1.rc1.gem  &&
-                   rm -rf devise.tmp
-
-	        bundle install --deployment                      \
-                               --path="../$bundle_name/bundle"   \
-                               --without=test rdoc
-
-	        cp AUTHORS Gemfile GNU-AGPL-3.0 COPYRIGHT "../$bundle_name"
-            popd
-            tar czf $bundle_name.tar.gz $bundle_name
-    }
-}
-
-function make_links()
-# Usage: make_links [source commit]
-{
-    dest=$(rpm --eval %_sourcedir)
-    test -z "$dest" && {
-        echo "Can't find RPM source directory, giving up."
-        exit 2
-    }
-
-    src_commit="$1"
-    test -z "$src_commit" && {
-         src_commit=$(checkout)
-    }
-    src="dist/diaspora-$VERSION-$src_commit.tar.gz"
-    ln -sf $PWD/$src $dest
-
-    bundle_commit=$(git_id dist/diaspora/Gemfile)
-    bundle="dist/diaspora-bundle-$VERSION-$bundle_commit.tar.gz"
-    ln -sf $PWD/$bundle $dest
-    cd $dest
-    find . -type l -not -readable -exec rm {} \;
-}
-
-    
-  
-
-
-
-function usage()
-{
-    	cat <<- EOF
-
-		Usage: make_dist [-c commit] <dist|bundle|links>
-
-		-c             Use a given commit, defaults to last checked in.
-		dist           Build a diaspora application tarball.
-		bundle         Build a bundler(1) bundle for diaspora.
-		links          Symlink bundle and source tarballs to rpm sourde dir.
-		
-		All results are stored in dist/
-	EOF
-}		
-test "$1" = "-h"  -o $# = 0 && {
-    usage;
-    exit 0
-}
-
-test "$1" = "-c" && {
-    test-z "$2" && {
-        usage;
-        exit 1
-    }
-    commit="$2"
-    shift; shift
-}
-    
-    
- case $1 in
- 
-     "bundle")  make_bundle $commit
-                ;;
-     'source')    make_dist $commit
-                ;;
-
-     'links')   make_links $commit
-                ;;
-
-     "fix_gemfile")
-                fix_gemfile
-                ;;
-                
-            *)  usage
-                exit 1
-                ;;
- esac
- 
-         
-

From 8fae836b654ef6a2760c26d7f665d55b13d06c42 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Thu, 7 Oct 2010 15:28:58 -0700
Subject: [PATCH 25/32] isolating the problem

---
 config/initializers/mailer_config.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
index 13aee7b5a..4890422cf 100644
--- a/config/initializers/mailer_config.rb
+++ b/config/initializers/mailer_config.rb
@@ -4,14 +4,14 @@
 
 Diaspora::Application.configure do
   config.action_mailer.delivery_method = :smtp
-  config.action_mailer.default_url_options = {:host => APP_CONFIG[:terse_pod_url]}
+  config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
   config.action_mailer.smtp_settings = {
-    :address => APP_CONFIG[:smtp_address],
-    :port => APP_CONFIG[:smtp_port].to_i,
-    :domain => APP_CONFIG[:smtp_domain],
-    :authentication => APP_CONFIG[:smtp_authentication],
-    :user_name => APP_CONFIG[:smtp_username],
-    :password => APP_CONFIG[:smtp_password],
+    :address => 'pivots.joindiaspora.com',
+    :port => 587,
+    :domain => 'mail.joindiaspora.com',
+    :authentication => 'plain',
+    :user_name => 'diaspora-pivots@joindiaspora.com',
+    :password => "xy289|]G+R*-kA",
     :enable_starttls_auto => true
   }
 end

From 720d1daa9ec66b4c6ecbb96e7f62d96edfec1fd1 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Thu, 7 Oct 2010 15:40:18 -0700
Subject: [PATCH 26/32] moved the mailer settings back into env

---
 config/environments/development.rb   | 12 ++++++++++++
 config/environments/production.rb    | 11 +++++++++++
 config/initializers/mailer_config.rb | 17 -----------------
 3 files changed, 23 insertions(+), 17 deletions(-)
 delete mode 100644 config/initializers/mailer_config.rb

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 063adbd1b..fdd10c25d 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -24,4 +24,16 @@ Diaspora::Application.configure do
   config.active_support.deprecation = :log
   config.middleware.use MongoMapper::ClearDevMemory
   #config.threadsafe!
+
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
+  config.action_mailer.smtp_settings = {
+    :address => 'pivots.joindiaspora.com',
+    :port => 587,
+    :domain => 'mail.joindiaspora.com',
+    :authentication => 'plain',
+    :user_name => 'diaspora-pivots@joindiaspora.com',
+    :password => "xy289|]G+R*-kA",
+    :enable_starttls_auto => true
+  }
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index bdeeea249..6a7c03599 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -48,4 +48,15 @@ Diaspora::Application.configure do
   config.i18n.fallbacks = true
   config.threadsafe!
 
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
+  config.action_mailer.smtp_settings = {
+    :address => 'pivots.joindiaspora.com',
+    :port => 587,
+    :domain => 'mail.joindiaspora.com',
+    :authentication => 'plain',
+    :user_name => 'diaspora-pivots@joindiaspora.com',
+    :password => "xy289|]G+R*-kA",
+    :enable_starttls_auto => true
+  }
 end
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
deleted file mode 100644
index 4890422cf..000000000
--- a/config/initializers/mailer_config.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
-#   the COPYRIGHT file.
-
-Diaspora::Application.configure do
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
-  config.action_mailer.smtp_settings = {
-    :address => 'pivots.joindiaspora.com',
-    :port => 587,
-    :domain => 'mail.joindiaspora.com',
-    :authentication => 'plain',
-    :user_name => 'diaspora-pivots@joindiaspora.com',
-    :password => "xy289|]G+R*-kA",
-    :enable_starttls_auto => true
-  }
-end

From ec3102cecd8a7353625bc280ec1a24778935b976 Mon Sep 17 00:00:00 2001
From: Crimer <crimer90@gmail.com>
Date: Fri, 8 Oct 2010 00:52:04 +0000
Subject: [PATCH 27/32] Fixed typo in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bac9cd40f..fc4b5aedf 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ We are continuing to build features and improve the code base.
 When we think it is ready for general use, we will post more final
 instructions.
 
-## Commit Guidlines
+## Commit Guidelines
 
 You are welcome to contribute, add to and extend Diaspora however you see fit.  We
 will do our best to incorporate everything that meets our guidelines.

From c855a93cbd214da6cff22ddd1f8fc95305548de2 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Thu, 7 Oct 2010 16:06:59 -0700
Subject: [PATCH 28/32] Move install scripts to /pkg

---
 {script => pkg}/bootstrap-fedora-diaspora.sh | 0
 {script => pkg}/ubuntu-setup.bash            | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {script => pkg}/bootstrap-fedora-diaspora.sh (100%)
 rename {script => pkg}/ubuntu-setup.bash (100%)

diff --git a/script/bootstrap-fedora-diaspora.sh b/pkg/bootstrap-fedora-diaspora.sh
similarity index 100%
rename from script/bootstrap-fedora-diaspora.sh
rename to pkg/bootstrap-fedora-diaspora.sh
diff --git a/script/ubuntu-setup.bash b/pkg/ubuntu-setup.bash
similarity index 100%
rename from script/ubuntu-setup.bash
rename to pkg/ubuntu-setup.bash

From 1fd3aeabd980761be703889ca69ba3a0e6979a9b Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Thu, 7 Oct 2010 16:25:34 -0700
Subject: [PATCH 29/32] Add or later to license notice

---
 Capfile                                             | 2 +-
 Rakefile                                            | 2 +-
 app/controllers/albums_controller.rb                | 2 +-
 app/controllers/application_controller.rb           | 2 +-
 app/controllers/aspects_controller.rb               | 2 +-
 app/controllers/comments_controller.rb              | 2 +-
 app/controllers/dev_utilities_controller.rb         | 2 +-
 app/controllers/people_controller.rb                | 2 +-
 app/controllers/photos_controller.rb                | 2 +-
 app/controllers/publics_controller.rb               | 2 +-
 app/controllers/registrations_controller.rb         | 2 +-
 app/controllers/requests_controller.rb              | 2 +-
 app/controllers/services_controller.rb              | 2 +-
 app/controllers/sockets_controller.rb               | 2 +-
 app/controllers/status_messages_controller.rb       | 2 +-
 app/controllers/users_controller.rb                 | 2 +-
 app/helpers/albums_helper.rb                        | 2 +-
 app/helpers/application_helper.rb                   | 2 +-
 app/helpers/aspects_helper.rb                       | 2 +-
 app/helpers/dashboards_helper.rb                    | 2 +-
 app/helpers/error_messages_helper.rb                | 2 +-
 app/helpers/layout_helper.rb                        | 2 +-
 app/helpers/people_helper.rb                        | 2 +-
 app/helpers/photos_helper.rb                        | 2 +-
 app/helpers/publics_helper.rb                       | 2 +-
 app/helpers/requests_helper.rb                      | 2 +-
 app/helpers/sockets_helper.rb                       | 2 +-
 app/helpers/status_messages_helper.rb               | 2 +-
 app/models/album.rb                                 | 2 +-
 app/models/aspect.rb                                | 2 +-
 app/models/comment.rb                               | 2 +-
 app/models/fb_status.rb                             | 2 +-
 app/models/person.rb                                | 2 +-
 app/models/photo.rb                                 | 2 +-
 app/models/post.rb                                  | 2 +-
 app/models/profile.rb                               | 2 +-
 app/models/request.rb                               | 2 +-
 app/models/retraction.rb                            | 2 +-
 app/models/status_message.rb                        | 2 +-
 app/models/user.rb                                  | 2 +-
 app/uploaders/image_uploader.rb                     | 2 +-
 app/views/albums/_album.html.haml                   | 2 +-
 app/views/albums/_new_album.haml                    | 2 +-
 app/views/albums/edit.html.haml                     | 2 +-
 app/views/albums/index.html.haml                    | 2 +-
 app/views/albums/show.html.haml                     | 2 +-
 app/views/aspects/_new_aspect.haml                  | 2 +-
 app/views/aspects/index.html.haml                   | 2 +-
 app/views/aspects/manage.html.haml                  | 2 +-
 app/views/aspects/public.html.haml                  | 2 +-
 app/views/aspects/show.html.haml                    | 2 +-
 app/views/comments/_comment.html.haml               | 2 +-
 app/views/comments/_comments.html.haml              | 2 +-
 app/views/comments/_new_comment.html.haml           | 2 +-
 app/views/js/_websocket_js.haml                     | 2 +-
 app/views/layouts/application.html.haml             | 2 +-
 app/views/layouts/session_wall.html.haml            | 2 +-
 app/views/people/_person.html.haml                  | 2 +-
 app/views/people/index.html.haml                    | 2 +-
 app/views/people/new.html.haml                      | 2 +-
 app/views/people/show.html.haml                     | 2 +-
 app/views/photos/_new_photo.haml                    | 2 +-
 app/views/photos/_photo.haml                        | 2 +-
 app/views/photos/edit.html.haml                     | 2 +-
 app/views/photos/new.html.haml                      | 2 +-
 app/views/photos/show.html.haml                     | 2 +-
 app/views/posts/_debug.haml                         | 2 +-
 app/views/posts/_post.html.haml                     | 2 +-
 app/views/requests/_new_request.haml                | 2 +-
 app/views/shared/_aspect_friends.haml               | 2 +-
 app/views/shared/_aspect_nav.haml                   | 2 +-
 app/views/shared/_post_wrapper.haml                 | 2 +-
 app/views/shared/_publisher.haml                    | 2 +-
 app/views/shared/_reshare.haml                      | 2 +-
 app/views/shared/log.haml                           | 2 +-
 app/views/status_messages/_new_status_message.haml  | 2 +-
 app/views/status_messages/_status_message.html.haml | 2 +-
 app/views/status_messages/index.html.haml           | 2 +-
 app/views/status_messages/show.html.haml            | 2 +-
 app/views/users/_profile.haml                       | 2 +-
 app/views/users/_services.haml                      | 2 +-
 app/views/users/edit.html.haml                      | 2 +-
 autotest/discover.rb                                | 2 +-
 config.ru                                           | 2 +-
 config/app_config.yml.example                       | 2 +-
 config/application.rb                               | 2 +-
 config/boot.rb                                      | 2 +-
 config/deploy.rb                                    | 2 +-
 config/deploy_config.yml                            | 2 +-
 config/environment.rb                               | 2 +-
 config/environments/development.rb                  | 2 +-
 config/environments/production.rb                   | 2 +-
 config/environments/test.rb                         | 2 +-
 config/initializers/_load_app_config.rb             | 2 +-
 config/initializers/_mongo.rb                       | 2 +-
 config/initializers/backtrace_silencers.rb          | 2 +-
 config/initializers/carrierwave.rb                  | 2 +-
 config/initializers/devise.rb                       | 2 +-
 config/initializers/git_info.rb                     | 2 +-
 config/initializers/inflections.rb                  | 2 +-
 config/initializers/locale.rb                       | 2 +-
 config/initializers/logging.rb                      | 2 +-
 config/initializers/mime_types.rb                   | 2 +-
 config/initializers/rspec_generator.rb              | 2 +-
 config/initializers/secret_token.rb                 | 2 +-
 config/initializers/session_store.rb                | 2 +-
 config/locales/devise/devise.ar.yml                 | 2 +-
 config/locales/devise/devise.cs.yml                 | 2 +-
 config/locales/devise/devise.cy.yml                 | 2 +-
 config/locales/devise/devise.de.yml                 | 2 +-
 config/locales/devise/devise.en.yml                 | 2 +-
 config/locales/devise/devise.fi.yml                 | 2 +-
 config/locales/devise/devise.fr-informal.yml        | 2 +-
 config/locales/devise/devise.fr.yml                 | 2 +-
 config/locales/devise/devise.he.yml                 | 2 +-
 config/locales/devise/devise.it.yml                 | 2 +-
 config/locales/devise/devise.lt.yml                 | 2 +-
 config/locales/devise/devise.nb.yml                 | 2 +-
 config/locales/devise/devise.pl.yml                 | 2 +-
 config/locales/devise/devise.pt-BR.yml              | 2 +-
 config/locales/devise/devise.pt-PT.yml              | 2 +-
 config/locales/devise/devise.ro.yml                 | 2 +-
 config/locales/devise/devise.ru.yml                 | 2 +-
 config/locales/devise/devise.sv.yml                 | 2 +-
 config/locales/diaspora/ar.yml                      | 2 +-
 config/locales/diaspora/cs.yml                      | 2 +-
 config/locales/diaspora/cy.yml                      | 2 +-
 config/locales/diaspora/de.yml                      | 2 +-
 config/locales/diaspora/en.yml                      | 2 +-
 config/locales/diaspora/es.yml                      | 2 +-
 config/locales/diaspora/fi.yml                      | 2 +-
 config/locales/diaspora/fr-informal.yml             | 2 +-
 config/locales/diaspora/fr.yml                      | 2 +-
 config/locales/diaspora/he.yml                      | 2 +-
 config/locales/diaspora/it.yml                      | 2 +-
 config/locales/diaspora/lt.yml                      | 2 +-
 config/locales/diaspora/nb.yml                      | 2 +-
 config/locales/diaspora/pl.yml                      | 2 +-
 config/locales/diaspora/pt-BR.yml                   | 2 +-
 config/locales/diaspora/pt-PT.yml                   | 2 +-
 config/locales/diaspora/ro.yml                      | 2 +-
 config/locales/diaspora/ru.yml                      | 2 +-
 config/locales/diaspora/sv.yml                      | 2 +-
 config/routes.rb                                    | 2 +-
 config/selenium.yml                                 | 2 +-
 config/sprinkle/conf/nginx.conf                     | 2 +-
 config/sprinkle/packages/database.rb                | 2 +-
 config/sprinkle/packages/essential.rb               | 2 +-
 config/sprinkle/packages/ruby.rb                    | 2 +-
 config/sprinkle/packages/scm.rb                     | 2 +-
 config/sprinkle/packages/server.rb                  | 2 +-
 config/sprinkle/packages/unfortunately_essential.rb | 2 +-
 config/sprinkle/provision.rb                        | 2 +-
 config/thin.yml                                     | 2 +-
 db/schema.rb                                        | 2 +-
 db/seeds.rb                                         | 2 +-
 db/seeds/backer.rb                                  | 2 +-
 db/seeds/dev.rb                                     | 2 +-
 db/seeds/tom.rb                                     | 2 +-
 lib/chrome_frame.rb                                 | 2 +-
 lib/diaspora.rb                                     | 2 +-
 lib/diaspora/exporter.rb                            | 2 +-
 lib/diaspora/ostatus_builder.rb                     | 2 +-
 lib/diaspora/parser.rb                              | 2 +-
 lib/diaspora/user/friending.rb                      | 2 +-
 lib/diaspora/user/querying.rb                       | 2 +-
 lib/diaspora/webhooks.rb                            | 2 +-
 lib/diaspora/websocket.rb                           | 2 +-
 lib/encryptable.rb                                  | 2 +-
 lib/encryptor.rb                                    | 2 +-
 lib/hcard.rb                                        | 2 +-
 lib/message_handler.rb                              | 2 +-
 lib/mongo_mapper/bson_id.rb                         | 2 +-
 lib/mongo_mapper/clear_dev_memory.rb                | 2 +-
 lib/salmon/salmon.rb                                | 2 +-
 lib/tasks/db.rake                                   | 2 +-
 lib/tasks/generate_session_secret.rake              | 2 +-
 lib/tasks/rspec.rake                                | 2 +-
 pkg/ubuntu-setup.bash                               | 2 +-
 public/javascripts/aspect-edit.js                   | 2 +-
 public/javascripts/image_picker.js                  | 2 +-
 public/javascripts/stream.js                        | 2 +-
 public/javascripts/view.js                          | 2 +-
 public/stylesheets/sass/application.sass            | 2 +-
 public/stylesheets/sass/sessions.sass               | 2 +-
 public/stylesheets/sass/ui.sass                     | 2 +-
 script/websocket_server.rb                          | 2 +-
 spec/controllers/albums_controller_spec.rb          | 2 +-
 spec/controllers/aspects_controller_spec.rb         | 2 +-
 spec/controllers/dev_utilities_controller_spec.rb   | 2 +-
 spec/controllers/people_controller_spec.rb          | 2 +-
 spec/controllers/publics_controller_spec.rb         | 2 +-
 spec/controllers/sockets_controller_spec.rb         | 2 +-
 spec/controllers/users_controller_spec.rb           | 2 +-
 spec/factories.rb                                   | 2 +-
 spec/helpers/application_helper_spec.rb             | 2 +-
 spec/helpers/publics_helper_spec.rb                 | 2 +-
 spec/helpers/requests_helper_spec.rb                | 2 +-
 spec/lib/diaspora_parser_spec.rb                    | 2 +-
 spec/lib/exporter_spec.rb                           | 2 +-
 spec/lib/hcard_spec.rb                              | 2 +-
 spec/lib/message_handler_spec.rb                    | 2 +-
 spec/lib/ostatus_builder_spec.rb                    | 2 +-
 spec/lib/salmon_salmon_spec.rb                      | 2 +-
 spec/lib/web_hooks_spec.rb                          | 2 +-
 spec/lib/websocket_spec.rb                          | 2 +-
 spec/misc_spec.rb                                   | 2 +-
 spec/models/album_spec.rb                           | 2 +-
 spec/models/aspect_spec.rb                          | 2 +-
 spec/models/comments_spec.rb                        | 2 +-
 spec/models/fb_status_spec.rb                       | 2 +-
 spec/models/person_spec.rb                          | 2 +-
 spec/models/photo_spec.rb                           | 2 +-
 spec/models/post_spec.rb                            | 2 +-
 spec/models/profile_spec.rb                         | 2 +-
 spec/models/request_spec.rb                         | 2 +-
 spec/models/retraction_spec.rb                      | 2 +-
 spec/models/status_message_spec.rb                  | 2 +-
 spec/models/user/posting_spec.rb                    | 2 +-
 spec/models/user/receive_spec.rb                    | 2 +-
 spec/models/user/user_friending_spec.rb             | 2 +-
 spec/models/user/visible_posts_spec.rb              | 2 +-
 spec/models/user_spec.rb                            | 2 +-
 spec/spec_helper.rb                                 | 2 +-
 spec/user_encryption_spec.rb                        | 2 +-
 225 files changed, 225 insertions(+), 225 deletions(-)

diff --git a/Capfile b/Capfile
index 306a9d64b..2fa68b66d 100644
--- a/Capfile
+++ b/Capfile
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 load 'deploy' if respond_to?(:namespace) # cap2 differentiator
diff --git a/Rakefile b/Rakefile
index fa9be254a..c5f223293 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Add your own tasks in files placed in lib/tasks ending in .rake,
diff --git a/app/controllers/albums_controller.rb b/app/controllers/albums_controller.rb
index 9e4859830..5cfbe4c85 100644
--- a/app/controllers/albums_controller.rb
+++ b/app/controllers/albums_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class AlbumsController < ApplicationController
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 52975730b..09f82d38e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class ApplicationController < ActionController::Base
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 81056ef10..34b722aee 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class AspectsController < ApplicationController
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index d1efc3e10..8d5ce80fc 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class CommentsController < ApplicationController
diff --git a/app/controllers/dev_utilities_controller.rb b/app/controllers/dev_utilities_controller.rb
index bd9a849ab..a556547b0 100644
--- a/app/controllers/dev_utilities_controller.rb
+++ b/app/controllers/dev_utilities_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class DevUtilitiesController < ApplicationController
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index be1f89991..6ada5bfe1 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class PeopleController < ApplicationController
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index dca510374..a1ef260b1 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class PhotosController < ApplicationController
diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index f57b94540..d2348a0d9 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class PublicsController < ApplicationController
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index b630c6617..b29887112 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class RegistrationsController < Devise::RegistrationsController
diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index 31c6e6efd..79a29461e 100644
--- a/app/controllers/requests_controller.rb
+++ b/app/controllers/requests_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class RequestsController < ApplicationController
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb
index 82a58c508..97f52cef2 100644
--- a/app/controllers/services_controller.rb
+++ b/app/controllers/services_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 
diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb
index 88d8e6b40..95f327fed 100644
--- a/app/controllers/sockets_controller.rb
+++ b/app/controllers/sockets_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class SocketsController < ApplicationController
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 137dd8a7e..f447e96b5 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class StatusMessagesController < ApplicationController
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ac22a32b7..407b85330 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class UsersController < ApplicationController
diff --git a/app/helpers/albums_helper.rb b/app/helpers/albums_helper.rb
index 6d85c747c..a5e47b440 100644
--- a/app/helpers/albums_helper.rb
+++ b/app/helpers/albums_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module AlbumsHelper
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7745ace96..54a4555d2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module ApplicationHelper
diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb
index 66baffca2..265b052a8 100644
--- a/app/helpers/aspects_helper.rb
+++ b/app/helpers/aspects_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module AspectsHelper
diff --git a/app/helpers/dashboards_helper.rb b/app/helpers/dashboards_helper.rb
index e8a9d8f71..57d64397c 100644
--- a/app/helpers/dashboards_helper.rb
+++ b/app/helpers/dashboards_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module DashboardsHelper
diff --git a/app/helpers/error_messages_helper.rb b/app/helpers/error_messages_helper.rb
index 9a64dca36..6c1e46209 100644
--- a/app/helpers/error_messages_helper.rb
+++ b/app/helpers/error_messages_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module ErrorMessagesHelper
diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb
index e33556c35..166e6b254 100644
--- a/app/helpers/layout_helper.rb
+++ b/app/helpers/layout_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # These helper methods can be called in your template to set variables to be used in the layout
diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb
index f1fa6487f..05f53def3 100644
--- a/app/helpers/people_helper.rb
+++ b/app/helpers/people_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module PeopleHelper
diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb
index 1f52daa0c..ede57d43e 100644
--- a/app/helpers/photos_helper.rb
+++ b/app/helpers/photos_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module PhotosHelper
diff --git a/app/helpers/publics_helper.rb b/app/helpers/publics_helper.rb
index f14fad7a6..7b6a8763b 100644
--- a/app/helpers/publics_helper.rb
+++ b/app/helpers/publics_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module PublicsHelper
diff --git a/app/helpers/requests_helper.rb b/app/helpers/requests_helper.rb
index 98ccc8f75..00cf61e5d 100644
--- a/app/helpers/requests_helper.rb
+++ b/app/helpers/requests_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module RequestsHelper
diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index 892e15f59..86bef13fa 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module SocketsHelper
diff --git a/app/helpers/status_messages_helper.rb b/app/helpers/status_messages_helper.rb
index 08461b635..2dfbd31cc 100644
--- a/app/helpers/status_messages_helper.rb
+++ b/app/helpers/status_messages_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module StatusMessagesHelper
diff --git a/app/models/album.rb b/app/models/album.rb
index f62cbdb79..4f7294ff9 100644
--- a/app/models/album.rb
+++ b/app/models/album.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Album < Post
diff --git a/app/models/aspect.rb b/app/models/aspect.rb
index 10f7aba14..2e6dca694 100644
--- a/app/models/aspect.rb
+++ b/app/models/aspect.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Aspect
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 4bf0dbd5e..540b44f2e 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Comment
diff --git a/app/models/fb_status.rb b/app/models/fb_status.rb
index 40d9cb16e..0e7d2692e 100644
--- a/app/models/fb_status.rb
+++ b/app/models/fb_status.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 
diff --git a/app/models/person.rb b/app/models/person.rb
index 8d1fee5d5..76bcd2aa3 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.expand_path('../../../lib/hcard', __FILE__)
diff --git a/app/models/photo.rb b/app/models/photo.rb
index 15d105739..a6e20ba33 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class PhotoAlbumValidator < ActiveModel::Validator
diff --git a/app/models/post.rb b/app/models/post.rb
index aba822160..ca4a5a2c9 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Post
diff --git a/app/models/profile.rb b/app/models/profile.rb
index 2b8303bd1..3bc9a18ac 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Profile
diff --git a/app/models/request.rb b/app/models/request.rb
index 5ba4769a2..6cf3d77ae 100644
--- a/app/models/request.rb
+++ b/app/models/request.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Request
diff --git a/app/models/retraction.rb b/app/models/retraction.rb
index 20f74bf29..10b055a38 100644
--- a/app/models/retraction.rb
+++ b/app/models/retraction.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class Retraction
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index b509bfe5a..1c167706e 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class StatusMessage < Post
diff --git a/app/models/user.rb b/app/models/user.rb
index 238397bdc..01094d219 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.expand_path('../../../lib/diaspora/user/friending', __FILE__)
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index 247f5f997..9beba3ef6 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class ImageUploader < CarrierWave::Uploader::Base
diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml
index 4f41e5cfb..f9f7d43e2 100644
--- a/app/views/albums/_album.html.haml
+++ b/app/views/albums/_album.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 .album{:id => post.id, :class => ("mine" if current_user.owns?(post))}
diff --git a/app/views/albums/_new_album.haml b/app/views/albums/_new_album.haml
index e0212a6b4..07431d20c 100644
--- a/app/views/albums/_new_album.haml
+++ b/app/views/albums/_new_album.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %h1=t('.add_a_new_album')
diff --git a/app/views/albums/edit.html.haml b/app/views/albums/edit.html.haml
index 67cc3071d..0f96bc1cd 100644
--- a/app/views/albums/edit.html.haml
+++ b/app/views/albums/edit.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 .back= link_to "⇧ #{@album.name}", @album
diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index 2e680c110..0d68bb1c1 100644
--- a/app/views/albums/index.html.haml
+++ b/app/views/albums/index.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - content_for :head do
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 4c9ba19b8..6ba593d62 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 :javascript
diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml
index 548abd0d1..8c3c45f4d 100644
--- a/app/views/aspects/_new_aspect.haml
+++ b/app/views/aspects/_new_aspect.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %h1=t('.add_a_new_aspect')
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index ae24e8e3b..772a71971 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - content_for :page_title do
diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml
index e08f6dabd..e818657e8 100644
--- a/app/views/aspects/manage.html.haml
+++ b/app/views/aspects/manage.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - content_for :head do
diff --git a/app/views/aspects/public.html.haml b/app/views/aspects/public.html.haml
index e85cae276..381676cf2 100644
--- a/app/views/aspects/public.html.haml
+++ b/app/views/aspects/public.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 
diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml
index ae24e8e3b..772a71971 100644
--- a/app/views/aspects/show.html.haml
+++ b/app/views/aspects/show.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - content_for :page_title do
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 03a2fcf61..3e927f723 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %li.comment{:id => post.id}
diff --git a/app/views/comments/_comments.html.haml b/app/views/comments/_comments.html.haml
index aecfb4bf1..7378fc97e 100644
--- a/app/views/comments/_comments.html.haml
+++ b/app/views/comments/_comments.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %div.comments
diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index 99c03f898..2c95d4385 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/app/views/comments/_new_comment.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 = form_for Comment.new, :remote => true do |f|
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 4677f6ce6..a0663edfc 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 = javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index fc063e0b6..99dec9e35 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 !!!
diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml
index 29b863b32..bc15063d6 100644
--- a/app/views/layouts/session_wall.html.haml
+++ b/app/views/layouts/session_wall.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 !!!
diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml
index 7e22a5570..3e20a658a 100644
--- a/app/views/people/_person.html.haml
+++ b/app/views/people/_person.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %li.message{:id => person.id}
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index 5981569b8..4ad7a93af 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - content_for :publish do
diff --git a/app/views/people/new.html.haml b/app/views/people/new.html.haml
index 0584732bc..7685a8933 100644
--- a/app/views/people/new.html.haml
+++ b/app/views/people/new.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - title=t('.new_person')
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 9b5128160..3e1fc31e6 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - content_for :page_title do
diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml
index d1a4fc73f..6ba1327e8 100644
--- a/app/views/photos/_new_photo.haml
+++ b/app/views/photos/_new_photo.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 :javascript
diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index 5e86e32a6..71049ac72 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %li.message{:id => post.id}
diff --git a/app/views/photos/edit.html.haml b/app/views/photos/edit.html.haml
index e70030562..78186d248 100644
--- a/app/views/photos/edit.html.haml
+++ b/app/views/photos/edit.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %h1.big_text
diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml
index d8701c265..bca1d0884 100644
--- a/app/views/photos/new.html.haml
+++ b/app/views/photos/new.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 - title t('.new_photo')
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 53cda49ba..58c363240 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 :javascript
diff --git a/app/views/posts/_debug.haml b/app/views/posts/_debug.haml
index ef1984d7d..39bc2a5d5 100644
--- a/app/views/posts/_debug.haml
+++ b/app/views/posts/_debug.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 #debug_info
diff --git a/app/views/posts/_post.html.haml b/app/views/posts/_post.html.haml
index acad2e12b..5c306fa36 100644
--- a/app/views/posts/_post.html.haml
+++ b/app/views/posts/_post.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %ul
diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml
index 0dbf5b0a1..ced50fd54 100644
--- a/app/views/requests/_new_request.haml
+++ b/app/views/requests/_new_request.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %h1
diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
index 8c22700aa..03da4ee9b 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/app/views/shared/_aspect_friends.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 #friend_pictures
diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml
index dc01afd20..8d1fa844d 100644
--- a/app/views/shared/_aspect_nav.haml
+++ b/app/views/shared/_aspect_nav.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 #aspect_nav
diff --git a/app/views/shared/_post_wrapper.haml b/app/views/shared/_post_wrapper.haml
index 956706b68..538d90348 100644
--- a/app/views/shared/_post_wrapper.haml
+++ b/app/views/shared/_post_wrapper.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index d1ad995df..410670c85 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 #publisher
diff --git a/app/views/shared/_reshare.haml b/app/views/shared/_reshare.haml
index 9df1c9ce1..bf785e4fa 100644
--- a/app/views/shared/_reshare.haml
+++ b/app/views/shared/_reshare.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 :javascript
diff --git a/app/views/shared/log.haml b/app/views/shared/log.haml
index bf957bf7c..707507ff8 100644
--- a/app/views/shared/log.haml
+++ b/app/views/shared/log.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 = @log.to_s
diff --git a/app/views/status_messages/_new_status_message.haml b/app/views/status_messages/_new_status_message.haml
index c27585f0a..00db8eefe 100644
--- a/app/views/status_messages/_new_status_message.haml
+++ b/app/views/status_messages/_new_status_message.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 = form_for StatusMessage.new, :remote => true do |f|
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index d1568c7bb..d8c56ff2f 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
diff --git a/app/views/status_messages/index.html.haml b/app/views/status_messages/index.html.haml
index 43c065380..9bbd93abf 100644
--- a/app/views/status_messages/index.html.haml
+++ b/app/views/status_messages/index.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %h1.big_text status messages
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index 3d78dd29e..4521bae5a 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 %h1
diff --git a/app/views/users/_profile.haml b/app/views/users/_profile.haml
index cef161127..7f935972b 100644
--- a/app/views/users/_profile.haml
+++ b/app/views/users/_profile.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 
diff --git a/app/views/users/_services.haml b/app/views/users/_services.haml
index 648fbe161..07173ecd8 100644
--- a/app/views/users/_services.haml
+++ b/app/views/users/_services.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index e3fdca4ff..cd8deb068 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -1,5 +1,5 @@
 -#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3.  See
+-#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
 :javascript
diff --git a/autotest/discover.rb b/autotest/discover.rb
index 76b9d2044..a0d0bc50a 100644
--- a/autotest/discover.rb
+++ b/autotest/discover.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 Autotest.add_discovery { "rails" }
diff --git a/config.ru b/config.ru
index 0c65f5908..70f6cd2c4 100644
--- a/config.ru
+++ b/config.ru
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # This file is used by Rack-based servers to start the application.
diff --git a/config/app_config.yml.example b/config/app_config.yml.example
index deb69220e..0bd3771f7 100644
--- a/config/app_config.yml.example
+++ b/config/app_config.yml.example
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 default:
diff --git a/config/application.rb b/config/application.rb
index 59b82e216..6c813a82a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.expand_path('../boot', __FILE__)
diff --git a/config/boot.rb b/config/boot.rb
index 0d0c42268..02c15be66 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'rubygems'
diff --git a/config/deploy.rb b/config/deploy.rb
index a4f139b9c..b4893ec93 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 config = YAML.load_file(File.dirname(__FILE__) + '/deploy_config.yml')
diff --git a/config/deploy_config.yml b/config/deploy_config.yml
index 55aa00f6e..06a6747e1 100644
--- a/config/deploy_config.yml
+++ b/config/deploy_config.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 cross_server:
diff --git a/config/environment.rb b/config/environment.rb
index ddfc9c247..bf2896fc6 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Load the rails application
diff --git a/config/environments/development.rb b/config/environments/development.rb
index fdd10c25d..5c6718ff2 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.expand_path('../../../lib/mongo_mapper/clear_dev_memory', __FILE__)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6a7c03599..f28830e2b 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 Diaspora::Application.configure do
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 46b44db55..0c5f85bdf 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 Diaspora::Application.configure do
diff --git a/config/initializers/_load_app_config.rb b/config/initializers/_load_app_config.rb
index 22bf14ead..723e38525 100644
--- a/config/initializers/_load_app_config.rb
+++ b/config/initializers/_load_app_config.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 def load_config_yaml filename
diff --git a/config/initializers/_mongo.rb b/config/initializers/_mongo.rb
index 7d14315a7..41a2098c0 100644
--- a/config/initializers/_mongo.rb
+++ b/config/initializers/_mongo.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ENV['MONGODB_URL'] = ENV['MONGOHQ_URL'] || URI::Generic.build(:scheme => 'mongodb', :host => APP_CONFIG['mongo_host'], :port => APP_CONFIG['mongo_port'], :path => "/diaspora-#{Rails.env}").to_s
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index 1efed86e9..211f52bde 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Be sure to restart your server when you modify this file.
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index ed1d07f91..0451db212 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 CarrierWave.configure do |config|
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a02045546..620547cd5 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Use this hook to configure devise mailer, warden hooks and so forth. The first
diff --git a/config/initializers/git_info.rb b/config/initializers/git_info.rb
index 82fc99143..e7aaffdda 100644
--- a/config/initializers/git_info.rb
+++ b/config/initializers/git_info.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 GIT_INFO = `git show --name-only`
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 0e4097c04..a4331f61a 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Be sure to restart your server when you modify this file.
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
index 823179842..08d3923b0 100644
--- a/config/initializers/locale.rb
+++ b/config/initializers/locale.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
diff --git a/config/initializers/logging.rb b/config/initializers/logging.rb
index 48cc2fa30..08b639bf5 100644
--- a/config/initializers/logging.rb
+++ b/config/initializers/logging.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 Rails.logger = Logger.new(
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 77424db27..1c9cd8425 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Be sure to restart your server when you modify this file.
diff --git a/config/initializers/rspec_generator.rb b/config/initializers/rspec_generator.rb
index bdec44a03..0aa078ab9 100644
--- a/config/initializers/rspec_generator.rb
+++ b/config/initializers/rspec_generator.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 Diaspora::Application.configure do
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index 66c59261a..f7864e187 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Be sure to restart your server when you modify this file.
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index f4e36ea89..29a6621f3 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Be sure to restart your server when you modify this file.
diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml
index 2b555cb5f..922333521 100644
--- a/config/locales/devise/devise.ar.yml
+++ b/config/locales/devise/devise.ar.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ar:
diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index 26ff8044d..ec0e298b4 100644
--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 cs:
diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml
index d8b6d94f4..54704978b 100644
--- a/config/locales/devise/devise.cy.yml
+++ b/config/locales/devise/devise.cy.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 cy:
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index e6608c181..543ab1935 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 de:
diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
index 7ab686bd4..06308488b 100644
--- a/config/locales/devise/devise.en.yml
+++ b/config/locales/devise/devise.en.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 en:
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index c77ead4b2..5f122172f 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 #   Translator: jarkko moilanen, jm60697@gmail.com
 
diff --git a/config/locales/devise/devise.fr-informal.yml b/config/locales/devise/devise.fr-informal.yml
index 6fe14382e..298525ae9 100644
--- a/config/locales/devise/devise.fr-informal.yml
+++ b/config/locales/devise/devise.fr-informal.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 fr-informal:
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index 240e9d967..69518e4a6 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 fr:
diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
index 997ab6df0..806ac3a32 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 #   Translated to Hebrew by Yaron Shahrabani <sh.yaron@gmail.com>, 2010.
 
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
index 96044d191..bd40e97a7 100644
--- a/config/locales/devise/devise.it.yml
+++ b/config/locales/devise/devise.it.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 it:
diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml
index 8ae8f027b..9544bfd37 100644
--- a/config/locales/devise/devise.lt.yml
+++ b/config/locales/devise/devise.lt.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 lt:
diff --git a/config/locales/devise/devise.nb.yml b/config/locales/devise/devise.nb.yml
index c7aa1f27d..fdcff9a94 100644
--- a/config/locales/devise/devise.nb.yml
+++ b/config/locales/devise/devise.nb.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 nb:
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index 503fb6d61..893653095 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 pl:
diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml
index 5a39a4734..f7251fc6f 100644
--- a/config/locales/devise/devise.pt-BR.yml
+++ b/config/locales/devise/devise.pt-BR.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 pt-BR:
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index c0c955517..6bb679bfd 100644
--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 pt-PT:
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
index b4d12e6b6..a61b4e742 100644
--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ro:
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
index 1ac626861..8283e97a1 100644
--- a/config/locales/devise/devise.ru.yml
+++ b/config/locales/devise/devise.ru.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ru:
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index c83179bde..dab52d609 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 sv:
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index cddf87706..87522287a 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Arabic.
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 7b454f813..9512645e3 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Lithuanian. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index cd1c7dbd6..49343d246 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for English. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index e277a5efd..1f7c028ae 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Localization file for German. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 5595c4caa..5a5cc7a43 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for English. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 5a73715b9..4e3ea63b4 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for English. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 5e1a6da32..88e06e580 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 #   Translator jarkko moilanen, jm60697@gmail.com
 
diff --git a/config/locales/diaspora/fr-informal.yml b/config/locales/diaspora/fr-informal.yml
index 1c7950fe5..8a30d7ad9 100644
--- a/config/locales/diaspora/fr-informal.yml
+++ b/config/locales/diaspora/fr-informal.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Localization file for French (Informal Honorifics). Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index bab6f3852..92abcbcfb 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Localization file for French. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 221a7c5f7..5bf276163 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 #   Translated to Hebrew by Yaron Shahrabani <sh.yaron@gmail.com>, 2010.
 
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index fe4b305cc..4c934420d 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Italian. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 01295e389..417ebb37e 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Lithuanian. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 82f927db1..79c603471 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for English. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index c55b79691..378b93ced 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for English. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index e8ffcc8e1..c04a60759 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Portuguese Brazilian. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 6df399150..95c56ca50 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Portuguese Portugal. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index ed3234571..355f6c788 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ro:
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index f432c82d6..dd94acf08 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Sample localization file for Russian. Add more files in this directory for other locales.
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 1aa9ac2dc..b7d89d019 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Swedish localization file.
diff --git a/config/routes.rb b/config/routes.rb
index 6f9f529db..802ebd260 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 Diaspora::Application.routes.draw do
diff --git a/config/selenium.yml b/config/selenium.yml
index 0d679b602..5e10d5a02 100644
--- a/config/selenium.yml
+++ b/config/selenium.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 common: &common
diff --git a/config/sprinkle/conf/nginx.conf b/config/sprinkle/conf/nginx.conf
index 188daedcb..68eff1606 100644
--- a/config/sprinkle/conf/nginx.conf
+++ b/config/sprinkle/conf/nginx.conf
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 worker_processes 1;
diff --git a/config/sprinkle/packages/database.rb b/config/sprinkle/packages/database.rb
index ef290b424..fa402b8ce 100644
--- a/config/sprinkle/packages/database.rb
+++ b/config/sprinkle/packages/database.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 #package :mongo, :provides => :database do
diff --git a/config/sprinkle/packages/essential.rb b/config/sprinkle/packages/essential.rb
index 8b4349d06..f550f4f34 100644
--- a/config/sprinkle/packages/essential.rb
+++ b/config/sprinkle/packages/essential.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ## Special package, anything that defines a 'source' package means build-essential should be installed for Ubuntu
diff --git a/config/sprinkle/packages/ruby.rb b/config/sprinkle/packages/ruby.rb
index c29af29cf..2c2f59145 100644
--- a/config/sprinkle/packages/ruby.rb
+++ b/config/sprinkle/packages/ruby.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 ## Defines available packages
diff --git a/config/sprinkle/packages/scm.rb b/config/sprinkle/packages/scm.rb
index 981214a60..67aa2c849 100644
--- a/config/sprinkle/packages/scm.rb
+++ b/config/sprinkle/packages/scm.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 package :git, :provides => :scm do
diff --git a/config/sprinkle/packages/server.rb b/config/sprinkle/packages/server.rb
index 004883dad..129e7b7f6 100644
--- a/config/sprinkle/packages/server.rb
+++ b/config/sprinkle/packages/server.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 package :nginx, :provides=> :webserver do
diff --git a/config/sprinkle/packages/unfortunately_essential.rb b/config/sprinkle/packages/unfortunately_essential.rb
index 23975f870..f18f1ebb9 100644
--- a/config/sprinkle/packages/unfortunately_essential.rb
+++ b/config/sprinkle/packages/unfortunately_essential.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 #Fix dreamhost
diff --git a/config/sprinkle/provision.rb b/config/sprinkle/provision.rb
index c3a7acae8..d57ff29c0 100644
--- a/config/sprinkle/provision.rb
+++ b/config/sprinkle/provision.rb
@@ -1,6 +1,6 @@
 #
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require '#{File.dirname(__FILE__)}/packages/essential'
diff --git a/config/thin.yml b/config/thin.yml
index a49d85ce4..67f98104a 100644
--- a/config/thin.yml
+++ b/config/thin.yml
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 rackup: /usr/local/app/diaspora/current/config.ru
diff --git a/db/schema.rb b/db/schema.rb
index 19e6df260..a05d3a11c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # This file is auto-generated from the current state of the database. Instead of editing this file,
diff --git a/db/seeds.rb b/db/seeds.rb
index 687d2622e..2307e70d8 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # This file should contain all the record creation needed to seed the database with its default values.
diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb
index c4805eae8..2305dea93 100644
--- a/db/seeds/backer.rb
+++ b/db/seeds/backer.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # This file should contain all the record creation needed to seed the database with its default values.
diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb
index f10abec4f..873c58ec5 100644
--- a/db/seeds/dev.rb
+++ b/db/seeds/dev.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb
index 5c418c8db..947ba0b21 100644
--- a/db/seeds/tom.rb
+++ b/db/seeds/tom.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
diff --git a/lib/chrome_frame.rb b/lib/chrome_frame.rb
index 52a4eb459..87d9df65e 100644
--- a/lib/chrome_frame.rb
+++ b/lib/chrome_frame.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Rack
diff --git a/lib/diaspora.rb b/lib/diaspora.rb
index e8508b38b..3d06e3e12 100644
--- a/lib/diaspora.rb
+++ b/lib/diaspora.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/exporter.rb b/lib/diaspora/exporter.rb
index f23ed7681..b560f729c 100644
--- a/lib/diaspora/exporter.rb
+++ b/lib/diaspora/exporter.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/ostatus_builder.rb b/lib/diaspora/ostatus_builder.rb
index 48db7fd86..60a106ac5 100644
--- a/lib/diaspora/ostatus_builder.rb
+++ b/lib/diaspora/ostatus_builder.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/parser.rb b/lib/diaspora/parser.rb
index e8e7e8a2b..2d002a2c9 100644
--- a/lib/diaspora/parser.rb
+++ b/lib/diaspora/parser.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/user/friending.rb b/lib/diaspora/user/friending.rb
index 61f86a19b..6b2c26cea 100644
--- a/lib/diaspora/user/friending.rb
+++ b/lib/diaspora/user/friending.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index 7d74df4ed..9b08bd9b8 100644
--- a/lib/diaspora/user/querying.rb
+++ b/lib/diaspora/user/querying.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/webhooks.rb b/lib/diaspora/webhooks.rb
index fc241a6d3..fa1b75e32 100644
--- a/lib/diaspora/webhooks.rb
+++ b/lib/diaspora/webhooks.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/diaspora/websocket.rb b/lib/diaspora/websocket.rb
index 10e8bc9c8..09c553e20 100644
--- a/lib/diaspora/websocket.rb
+++ b/lib/diaspora/websocket.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Diaspora
diff --git a/lib/encryptable.rb b/lib/encryptable.rb
index 133c05156..c293c8257 100644
--- a/lib/encryptable.rb
+++ b/lib/encryptable.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
   module Encryptable
diff --git a/lib/encryptor.rb b/lib/encryptor.rb
index e9c4936e1..6927b9043 100644
--- a/lib/encryptor.rb
+++ b/lib/encryptor.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module Encryptor
diff --git a/lib/hcard.rb b/lib/hcard.rb
index 041f4d384..9d318f05a 100644
--- a/lib/hcard.rb
+++ b/lib/hcard.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module HCard
diff --git a/lib/message_handler.rb b/lib/message_handler.rb
index e3890d94f..0d201a994 100644
--- a/lib/message_handler.rb
+++ b/lib/message_handler.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class MessageHandler
diff --git a/lib/mongo_mapper/bson_id.rb b/lib/mongo_mapper/bson_id.rb
index 328c69a03..f1e0e9985 100644
--- a/lib/mongo_mapper/bson_id.rb
+++ b/lib/mongo_mapper/bson_id.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 class String
diff --git a/lib/mongo_mapper/clear_dev_memory.rb b/lib/mongo_mapper/clear_dev_memory.rb
index d63084765..574c32f7c 100644
--- a/lib/mongo_mapper/clear_dev_memory.rb
+++ b/lib/mongo_mapper/clear_dev_memory.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module MongoMapper
diff --git a/lib/salmon/salmon.rb b/lib/salmon/salmon.rb
index e7690a578..728524b4d 100644
--- a/lib/salmon/salmon.rb
+++ b/lib/salmon/salmon.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Add URL safe Base64 support
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index 82fc6fa9f..0b82b26a3 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 namespace :db do
diff --git a/lib/tasks/generate_session_secret.rake b/lib/tasks/generate_session_secret.rake
index c9fc129de..e868d3eba 100644
--- a/lib/tasks/generate_session_secret.rake
+++ b/lib/tasks/generate_session_secret.rake
@@ -7,7 +7,7 @@ namespace :generate do
   File.open(path, 'w') do |f|
     f.write <<"EOF"
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # Be sure to restart your server when you modify this file.
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
index 54442d71e..47d1a37ed 100644
--- a/lib/tasks/rspec.rake
+++ b/lib/tasks/rspec.rake
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 begin
diff --git a/pkg/ubuntu-setup.bash b/pkg/ubuntu-setup.bash
index 9a54211f6..cbf42c60a 100755
--- a/pkg/ubuntu-setup.bash
+++ b/pkg/ubuntu-setup.bash
@@ -5,7 +5,7 @@
 # This script helps to setup diaspora.
 #
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # USAGE: ./script/ubuntu-setup.bash
diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js
index cb36d394e..59ba6e331 100644
--- a/public/javascripts/aspect-edit.js
+++ b/public/javascripts/aspect-edit.js
@@ -1,5 +1,5 @@
 /*   Copyright (c) 2010, Diaspora Inc.  This file is
-*   licensed under the Affero General Public License version 3.  See
+*   licensed under the Affero General Public License version 3 or later.  See
 *   the COPYRIGHT file.
 */
 
diff --git a/public/javascripts/image_picker.js b/public/javascripts/image_picker.js
index 1342102ee..2692ffee9 100644
--- a/public/javascripts/image_picker.js
+++ b/public/javascripts/image_picker.js
@@ -1,5 +1,5 @@
 /*   Copyright (c) 2010, Diaspora Inc.  This file is
-*   licensed under the Affero General Public License version 3.  See
+*   licensed under the Affero General Public License version 3 or later.  See
 *   the COPYRIGHT file.
 */
 
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index 7811fb1a3..d4f72bcbc 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -1,5 +1,5 @@
 /*   Copyright (c) 2010, Diaspora Inc.  This file is
-*   licensed under the Affero General Public License version 3.  See
+*   licensed under the Affero General Public License version 3 or later.  See
 *   the COPYRIGHT file.
 */
 
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 1509145da..58264470f 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -1,5 +1,5 @@
 /*   Copyright (c) 2010, Diaspora Inc.  This file is
-*   licensed under the Affero General Public License version 3.  See
+*   licensed under the Affero General Public License version 3 or later.  See
 *   the COPYRIGHT file.
 */
 
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 225c5ca84..83465d57e 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -1,5 +1,5 @@
 //   Copyright (c) 2010, Diaspora Inc.  This file is
-//   licensed under the Affero General Public License version 3.  See
+//   licensed under the Affero General Public License version 3 or later.  See
 //   the COPYRIGHT file.
 
 
diff --git a/public/stylesheets/sass/sessions.sass b/public/stylesheets/sass/sessions.sass
index d7cf4644e..c785b8396 100644
--- a/public/stylesheets/sass/sessions.sass
+++ b/public/stylesheets/sass/sessions.sass
@@ -1,5 +1,5 @@
 //   Copyright (c) 2010, Diaspora Inc.  This file is
-//   licensed under the Affero General Public License version 3.  See
+//   licensed under the Affero General Public License version 3 or later.  See
 //   the COPYRIGHT file.
 
 
diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass
index d3ea77e0e..e064b3fcf 100644
--- a/public/stylesheets/sass/ui.sass
+++ b/public/stylesheets/sass/ui.sass
@@ -1,5 +1,5 @@
 //   Copyright (c) 2010, Diaspora Inc.  This file is
-//   licensed under the Affero General Public License version 3.  See
+//   licensed under the Affero General Public License version 3 or later.  See
 //   the COPYRIGHT file.
 
 
diff --git a/script/websocket_server.rb b/script/websocket_server.rb
index dae054f15..65199175e 100644
--- a/script/websocket_server.rb
+++ b/script/websocket_server.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.dirname(__FILE__) + '/../config/environment'
diff --git a/spec/controllers/albums_controller_spec.rb b/spec/controllers/albums_controller_spec.rb
index a8f5f8506..5c53f1909 100644
--- a/spec/controllers/albums_controller_spec.rb
+++ b/spec/controllers/albums_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index 2e05b850c..19bb7bf5d 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/controllers/dev_utilities_controller_spec.rb b/spec/controllers/dev_utilities_controller_spec.rb
index c4439c790..128c754be 100644
--- a/spec/controllers/dev_utilities_controller_spec.rb
+++ b/spec/controllers/dev_utilities_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require File.join(File.dirname(__FILE__), "..", "spec_helper")
diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb
index 4ce6e3e69..c2af4cc93 100644
--- a/spec/controllers/people_controller_spec.rb
+++ b/spec/controllers/people_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb
index 22e71befb..19c95a705 100644
--- a/spec/controllers/publics_controller_spec.rb
+++ b/spec/controllers/publics_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/controllers/sockets_controller_spec.rb b/spec/controllers/sockets_controller_spec.rb
index 905b1611e..37f59a831 100644
--- a/spec/controllers/sockets_controller_spec.rb
+++ b/spec/controllers/sockets_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 69c4b6df3..502353f6a 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/factories.rb b/spec/factories.rb
index 3444cf9e1..5e5c32b10 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 #For Guidance
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 459563cff..f64ca0b97 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/helpers/publics_helper_spec.rb b/spec/helpers/publics_helper_spec.rb
index bc6a5021b..9b52c30a4 100644
--- a/spec/helpers/publics_helper_spec.rb
+++ b/spec/helpers/publics_helper_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/helpers/requests_helper_spec.rb b/spec/helpers/requests_helper_spec.rb
index bf99f89d1..b21ebabfa 100644
--- a/spec/helpers/requests_helper_spec.rb
+++ b/spec/helpers/requests_helper_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/diaspora_parser_spec.rb b/spec/lib/diaspora_parser_spec.rb
index d5722fd65..fede700ad 100644
--- a/spec/lib/diaspora_parser_spec.rb
+++ b/spec/lib/diaspora_parser_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/exporter_spec.rb b/spec/lib/exporter_spec.rb
index 2831b8ef7..aafb4b13c 100644
--- a/spec/lib/exporter_spec.rb
+++ b/spec/lib/exporter_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/hcard_spec.rb b/spec/lib/hcard_spec.rb
index 45d7157b9..fc7bb8af5 100644
--- a/spec/lib/hcard_spec.rb
+++ b/spec/lib/hcard_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/message_handler_spec.rb b/spec/lib/message_handler_spec.rb
index ddc822334..3a62bc538 100644
--- a/spec/lib/message_handler_spec.rb
+++ b/spec/lib/message_handler_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/ostatus_builder_spec.rb b/spec/lib/ostatus_builder_spec.rb
index 042bf202b..8e838a643 100644
--- a/spec/lib/ostatus_builder_spec.rb
+++ b/spec/lib/ostatus_builder_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/salmon_salmon_spec.rb b/spec/lib/salmon_salmon_spec.rb
index 40f928c18..873d060c6 100644
--- a/spec/lib/salmon_salmon_spec.rb
+++ b/spec/lib/salmon_salmon_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/web_hooks_spec.rb b/spec/lib/web_hooks_spec.rb
index e316817d4..3a51ed1ed 100644
--- a/spec/lib/web_hooks_spec.rb
+++ b/spec/lib/web_hooks_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/lib/websocket_spec.rb b/spec/lib/websocket_spec.rb
index 0b76e0f52..84001fc9f 100644
--- a/spec/lib/websocket_spec.rb
+++ b/spec/lib/websocket_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/misc_spec.rb b/spec/misc_spec.rb
index c4b2cc67c..1db3f3f82 100644
--- a/spec/misc_spec.rb
+++ b/spec/misc_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/album_spec.rb b/spec/models/album_spec.rb
index ed13ba102..a47c6026d 100644
--- a/spec/models/album_spec.rb
+++ b/spec/models/album_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/aspect_spec.rb b/spec/models/aspect_spec.rb
index 23453eee9..6c8a4aef6 100644
--- a/spec/models/aspect_spec.rb
+++ b/spec/models/aspect_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/comments_spec.rb b/spec/models/comments_spec.rb
index 732c4349b..c46fed5ba 100644
--- a/spec/models/comments_spec.rb
+++ b/spec/models/comments_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/fb_status_spec.rb b/spec/models/fb_status_spec.rb
index 2ab232fce..a575a1873 100644
--- a/spec/models/fb_status_spec.rb
+++ b/spec/models/fb_status_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 
diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb
index 6df3ddc1c..67fd1409c 100644
--- a/spec/models/person_spec.rb
+++ b/spec/models/person_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index f3f77f3db..2a4ac4991 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index b0ed59b7d..bc445af99 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/profile_spec.rb b/spec/models/profile_spec.rb
index 2e38c20ae..7bba8311c 100644
--- a/spec/models/profile_spec.rb
+++ b/spec/models/profile_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/request_spec.rb b/spec/models/request_spec.rb
index c8fb8af05..5364ef5f3 100644
--- a/spec/models/request_spec.rb
+++ b/spec/models/request_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/retraction_spec.rb b/spec/models/retraction_spec.rb
index 777855234..fd8e3d28a 100644
--- a/spec/models/retraction_spec.rb
+++ b/spec/models/retraction_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb
index d7dbf19e4..2d8d0c5bf 100644
--- a/spec/models/status_message_spec.rb
+++ b/spec/models/status_message_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/user/posting_spec.rb b/spec/models/user/posting_spec.rb
index 518c03d2d..563e1473b 100644
--- a/spec/models/user/posting_spec.rb
+++ b/spec/models/user/posting_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/user/receive_spec.rb b/spec/models/user/receive_spec.rb
index fce699cf6..c9ec4e207 100644
--- a/spec/models/user/receive_spec.rb
+++ b/spec/models/user/receive_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/user/user_friending_spec.rb b/spec/models/user/user_friending_spec.rb
index 4ea51ad19..fa4dd53b6 100644
--- a/spec/models/user/user_friending_spec.rb
+++ b/spec/models/user/user_friending_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/user/visible_posts_spec.rb b/spec/models/user/visible_posts_spec.rb
index 040fcd1bc..c4cf40797 100644
--- a/spec/models/user/visible_posts_spec.rb
+++ b/spec/models/user/visible_posts_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d21b1d57c..100b9ff39 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4149200d8..7dede4436 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
diff --git a/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb
index a7fd8c548..f222a7674 100644
--- a/spec/user_encryption_spec.rb
+++ b/spec/user_encryption_spec.rb
@@ -1,5 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
+#   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 require 'spec_helper'

From f022c2d8bda03d3504391b298bad0e01f7ba1850 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Thu, 7 Oct 2010 16:42:39 -0700
Subject: [PATCH 30/32] correct smtp server

---
 config/environments/production.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 6a7c03599..cb13c1d1c 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -51,7 +51,7 @@ Diaspora::Application.configure do
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
   config.action_mailer.smtp_settings = {
-    :address => 'pivots.joindiaspora.com',
+    :address => 'smtp.gmail.com',
     :port => 587,
     :domain => 'mail.joindiaspora.com',
     :authentication => 'plain',

From 9c59adee516d358804952073c94db68fc890a97c Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Thu, 7 Oct 2010 16:48:49 -0700
Subject: [PATCH 31/32] in dev env as well

---
 config/environments/development.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 5c6718ff2..ee08a058f 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -28,7 +28,7 @@ Diaspora::Application.configure do
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
   config.action_mailer.smtp_settings = {
-    :address => 'pivots.joindiaspora.com',
+    :address => 'smtp.gmail.com',
     :port => 587,
     :domain => 'mail.joindiaspora.com',
     :authentication => 'plain',

From ad348ed24cdff569a9ad38944dc5f06062c18dac Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Thu, 7 Oct 2010 16:54:19 -0700
Subject: [PATCH 32/32] trying the mailer_condig

---
 config/environments/development.rb   | 12 ------------
 config/initializers/mailer_config.rb | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 config/initializers/mailer_config.rb

diff --git a/config/environments/development.rb b/config/environments/development.rb
index ee08a058f..80022947e 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -24,16 +24,4 @@ Diaspora::Application.configure do
   config.active_support.deprecation = :log
   config.middleware.use MongoMapper::ClearDevMemory
   #config.threadsafe!
-
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
-  config.action_mailer.smtp_settings = {
-    :address => 'smtp.gmail.com',
-    :port => 587,
-    :domain => 'mail.joindiaspora.com',
-    :authentication => 'plain',
-    :user_name => 'diaspora-pivots@joindiaspora.com',
-    :password => "xy289|]G+R*-kA",
-    :enable_starttls_auto => true
-  }
 end
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
new file mode 100644
index 000000000..46535ef84
--- /dev/null
+++ b/config/initializers/mailer_config.rb
@@ -0,0 +1,17 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+Diaspora::Application.configure do
+  config.action_mailer.delivery_method = :smtp
+  config.action_mailer.default_url_options = {:host => 'pivots.joindiaspora.com'}
+  config.action_mailer.smtp_settings = {
+    :address => 'smtp.gmail.com',
+    :port => 587,
+    :domain => 'mail.joindiaspora.com',
+    :authentication => 'plain',
+    :user_name => 'diaspora-pivots@joindiaspora.com',
+    :password => "xy289|]G+R*-kA",
+    :enable_starttls_auto => true
+  }
+end