Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revoming magent

  • Loading branch information...
commit f229222a8c18e733b5a771cef118ddeace8a3276 1 parent 8e125f7
@leamas leamas authored
View
1  fedora/README.md
@@ -63,7 +63,6 @@ Services are implemented using upstart with files /etc/init/diaspora-* To contro
separate services:
initctl <status|start|stop> diaspora-thin
initctl <status|start|stop> diaspora-websocket
- initctl <status|start|stop> diaspora-magent
initctl <status|start|stop> diaspora-redis
initctl <status|start|stop> diaspora-resque
View
3  fedora/SOURCES
@@ -4,6 +4,7 @@ diaspora
diaspora.logconf
make_rel_symlink.py
diaspora-websocket.conf
-diaspora-magent.conf
diaspora-thin.conf
+diaspora-redis.conf
+diaspora-resque.conf
bundler-1.0.7.gem
View
9 fedora/diaspora
@@ -19,8 +19,7 @@
# Default-Start:
# Default-Stop: 0 1 2 3 4 5 6
# Short-Description: start and stop Diaspora servers
-# Description: Controls the web, websockets and magent
-# services provided and used by Diaspora.
+# Description: Controls the Diaspora services.
### END INIT INFO
# Source function library.
@@ -43,7 +42,7 @@ start() {
[ -f $exec ] || exit 5
echo -n $"Starting Diaspora services: "
- for service in magent redis resque thin websocket; do
+ for service in redis resque thin websocket; do
echo -n " $service "
initctl start diaspora-$service \
>> /var/log/diaspora-$service.log 2>&1 &
@@ -68,7 +67,7 @@ start() {
stop() {
[ $UID -eq 0 ] || exit 4
echo -n $"Stopping diaspora services: "
- for service in thin redis magent resque websocket; do
+ for service in thin redis resque websocket; do
echo -n "$service "
initctl stop diaspora-$service > /dev/null
RETVAL=$?
@@ -110,7 +109,7 @@ case "$1" in
fi
;;
status)
- for service in websocket redis resque thin magent; do
+ for service in websocket redis resque thin ; do
status=$( initctl status diaspora-$service)
RETVAL=$?
[[ "$status" == *stop* ]] && RETVAL=$((RETVAL | 1))
View
13 fedora/diaspora-magent.conf
@@ -1,13 +0,0 @@
-# Fedora upstart file at /etc/init/diaspora-magent.conf
-
-stop on runlevel [06]
-
-script
- if [ -f /etc/default/diaspora ]; then
- . /etc/default/diaspora;
- fi;
- cd /usr/share/diaspora/master;
- logpath='/var/log/diaspora'
- su - diaspora -c "cd $PWD;/usr/local/bin/bundle exec \
- magent --piddir $logpath --log-path $logpath" >>$logpath/magent.log 2>&1
-end script
View
8 fedora/diaspora.spec
@@ -20,7 +20,8 @@ Source3: diaspora.logconf
Source4: make_rel_symlink.py
Source5: diaspora-thin.conf
Source6: diaspora-websocket.conf
-Source7: diaspora-magent.conf
+Source7: diaspora-redis.conf
+Source8: diaspora-resque.conf
BuildArch: noarch
BuildRoot: %{_rmpdir}/not-used-in-fedora/
@@ -56,7 +57,7 @@ cp %SOURCE1 $RPM_BUILD_ROOT/etc/init.d
sed -i '/^cd /s|.*|cd %{_datadir}/diaspora/master|' \
$RPM_BUILD_ROOT/etc/init.d/diaspora
mkdir -p $RPM_BUILD_ROOT/etc/init
-cp %SOURCE5 %SOURCE6 %SOURCE7 $RPM_BUILD_ROOT/etc/init
+cp %SOURCE5 %SOURCE6 %SOURCE7 %SOURCE8 $RPM_BUILD_ROOT/etc/init
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
cp %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/diaspora
@@ -147,7 +148,8 @@ rm -fr $RPM_BUILD_ROOT
%{_sysconfdir}/init.d/diaspora
%{_sysconfdir}/init/diaspora-websocket.conf
%{_sysconfdir}/init/diaspora-thin.conf
-%{_sysconfdir}/init/diaspora-magent.conf
+%{_sysconfdir}/init/diaspora-redis.conf
+%{_sysconfdir}/init/diaspora-resque.conf
%changelog
View
7 ubuntu/README.md
@@ -42,9 +42,10 @@ In most cases only source will need to be built, which is fast.
### Notes
The diaspora services are controlled by upstart. To start/stop:
- % initctl start <diaspora-thin|diaspora-magent|diaspora-weboscket>
- % initctl stop <diaspora-thin|diaspora-magent|diaspora-weboscket>
- % initctl status <diaspora-thin|diaspora-magent|diaspora-weboscket>
+ % sudo initctl <start|stop|status> diaspora-thin
+ % sudo initctl <start|stop|status> diaspora-redis
+ % sudo initctl <start|stop|status> diaspora-websocket
+ % sudo initctl <start|stop|status> diaspora-resque
To start/stop all services:
% sudo service diaspora <start|stop|status>
View
6 ubuntu/diaspora
@@ -45,7 +45,7 @@ do_status()
# 1 => at least one stopped, > 1 => errors.
{
local retval=0
- for service in websocket thin magent redis resque; do
+ for service in websocket thin redis resque; do
[ $service != 'websocket' ] && echo
service_status diaspora-$service
local status=$?
@@ -65,7 +65,7 @@ do_start()
# 1 if any daemon was already running
# 2 if one daemon could not be started (other's state undefined)
local retval=0
- for service in websocket thin magent redis resque; do
+ for service in websocket thin redis resque; do
service_status diaspora-$service &> /dev/null
local status=$?
case $status in
@@ -95,7 +95,7 @@ do_stop()
# 2 if any daemon could not be stopped
# other if a failure occurred
local retval=0
- for service in websocket thin magent resque redis; do
+ for service in websocket thin resque redis; do
service_status diaspora-$service &> /dev/null
local status=$?
case $status in
View
3  ubuntu/diaspora-install
@@ -31,7 +31,8 @@ sed -i '/BUNDLE_PATH/s|:.*|: /usr/lib/diaspora-bundle/vendor/bundle|' \
cp master/GNU-AGPL-3.0 master/COPYRIGHT master/README.md master/AUTHORS .
cp master/config/app_config.yml.example ./app_config.yml
cp master/pkg/ubuntu/diaspora-websocket.conf /etc/init
-cp master/pkg/ubuntu/diaspora-magent.conf /etc/init
+cp master/pkg/ubuntu/diaspora-resque.conf /etc/init
+cp master/pkg/ubuntu/diaspora-redis.conf /etc/init
cp master/pkg/ubuntu/diaspora-thin.conf /etc/init
cp master/pkg/ubuntu/diaspora /etc/init.d
View
14 ubuntu/diaspora-magent.conf
@@ -1,14 +0,0 @@
-# Ubuntu upstart file at /etc/init/diaspora-magent.conf
-
-start on runlevel [5]
-stop on runlevel [06]
-
-script
- if [ -f /etc/default/diaspora ]; then
- . /etc/default/diaspora;
- fi;
- cd /usr/share/diaspora/master;
- logpath='/var/log/diaspora'
- su - diaspora -c \
- "cd $PWD; bundle exec magent --log-path $logpath start"
-end script
Please sign in to comment.
Something went wrong with that request. Please try again.