Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Installation update

  • Loading branch information...
commit b2d0825efd6d8b95b42f2514012ef8db43bcf33b 1 parent 5859cc4
@leamas leamas authored
View
1  fedora/SOURCES
@@ -7,4 +7,5 @@ diaspora-websocket.conf
diaspora-thin.conf
diaspora-redis.conf
diaspora-resque.conf
+diaspora-daemon
bundler-1.0.7.gem
View
19 fedora/diaspora-daemon
@@ -0,0 +1,19 @@
+#!/usr/bin/ruby
+#
+require 'etc'
+
+begin
+ pwent = Etc.getpwnam('diaspora')
+ Process.gid = pwent.gid
+ Process.egid = pwent.gid
+ Process.uid = pwent.uid
+ Process.euid = pwent.uid
+rescue => e
+ logger "Can't set diaspora uid/gid: " + e.inspect
+ exit( 2 )
+end
+
+Dir.chdir( '/usr/share/diaspora/master')
+
+exec( ARGV.join(" ") )
+
View
3  fedora/diaspora-setup
@@ -42,6 +42,9 @@ test -e config/app_config.yml ||
redis_config
+chkconfig redis off
+service redis stop || :
+
init_appconfig config/app_config.yml $arg_hostname
mongodb_config /etc/mongodb.conf
View
3  fedora/diaspora.spec
@@ -22,6 +22,7 @@ Source5: diaspora-thin.conf
Source6: diaspora-websocket.conf
Source7: diaspora-redis.conf
Source8: diaspora-resque.conf
+Source9: diaspora-daemon
BuildArch: noarch
BuildRoot: %{_rmpdir}/not-used-in-fedora/
@@ -66,6 +67,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/diaspora
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/diaspora
cp -ar master $RPM_BUILD_ROOT/%{_datadir}/diaspora
cp -ar master/.bundle $RPM_BUILD_ROOT/%{_datadir}/diaspora/master
+
+cp %SOURCE9 $RPM_BUILD_ROOT/%{_datadir}/diaspora/master/script
rm -rf $RPM_BUILD_ROOT/%{_datadir}/diaspora/master/vendor/*
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/uploads
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/diaspora/tmp
View
2  source/funcs.sh
@@ -165,7 +165,7 @@ function init_db
function mongodb_config
#Ensure that mongodb only serves localhost (security).
{
- grep 'bind_ip' $1 || {
+ grep -q 'bind_ip' $1 || {
echo "Reconfiguring mongod to only serve localhost (127.0.0.1)"
echo >> $1
echo "bind_ip = 127.0.0.1 # Added by diaspora-setup" >> $1
View
2  ubuntu/diaspora-setup
@@ -52,6 +52,8 @@ test -e config/app_config.yml ||
[ -e lib/tasks/jasmine.rake ] &&
sudo mv lib/tasks/jasmine.rake lib/tasks/jasmine.no-rake
+cp pkg/ubuntu/diaspora-daemon script
+
redis_config
init_appconfig config/app_config.yml $arg_hostname
Please sign in to comment.
Something went wrong with that request. Please try again.