Docs: Add SysVinit snippet
And small fixes
This commit is contained in:
parent
4d4a58361b
commit
5af9af60f4
@ -103,8 +103,6 @@ createuser -d -P plume
|
||||
createdb -O plume plume
|
||||
```
|
||||
|
||||
```bash
|
||||
```
|
||||
|
||||
## Running migrations
|
||||
|
||||
@ -184,7 +182,7 @@ server {
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://localhost:8000/;
|
||||
proxy_pass http://localhost:7878/;
|
||||
proxy_set_header Host $http_host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
@ -240,7 +238,7 @@ If you prefer Apache, you can use this configuration (here too replace `blog.exa
|
||||
|
||||
## Systemd integration
|
||||
|
||||
If you want to manage your Plume instance with systemd, you can use the following unit file (to be saved in `/lib/systemd/system/plume.service`):
|
||||
If you want to manage your Plume instance with systemd, you can use the following unit file (to be saved in `/etc/systemd/system/plume.service`):
|
||||
|
||||
```toml
|
||||
[Unit]
|
||||
@ -258,6 +256,62 @@ Restart=always
|
||||
WantedBy=multi-user.target
|
||||
```
|
||||
|
||||
## SysVinit integration
|
||||
|
||||
This script can also be useful if you are using SysVinit.
|
||||
|
||||
```bash
|
||||
#!/bin/bash
|
||||
#
|
||||
# chkconfig: 35 90 12
|
||||
# description: Plume
|
||||
#
|
||||
|
||||
# Get function from functions library
|
||||
. /etc/init.d/functions
|
||||
|
||||
# Start Plume
|
||||
start() {
|
||||
initlog -c "echo -n Démarrage de Plume: "
|
||||
cd /home/plume/Plume & cargo run
|
||||
### Create the lock file ###
|
||||
touch /var/lock/subsys/plume
|
||||
success $"Plume est prêt !"
|
||||
echo
|
||||
}
|
||||
|
||||
# Restart Plume
|
||||
stop() {
|
||||
initlog -c "echo -n Arrêt de Plume: "
|
||||
killproc cargo run
|
||||
### Now, delete the lock file ###
|
||||
rm -f /var/lock/subsys/plume
|
||||
echo
|
||||
}
|
||||
|
||||
### main logic ###
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
status)
|
||||
status FOO
|
||||
;;
|
||||
restart|reload|condrestart)
|
||||
stop
|
||||
start
|
||||
;;
|
||||
*)
|
||||
echo $"Usage: $0 {start|stop|restart|reload|status}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit 0
|
||||
```
|
||||
|
||||
## Caveats:
|
||||
|
||||
- Pgbouncer is not yet supported (named transactions are used).
|
||||
|
@ -73,8 +73,8 @@ impl Reshare {
|
||||
|
||||
impl FromActivity<Announce, PgConnection> for Reshare {
|
||||
fn from_activity(conn: &PgConnection, announce: Announce, _actor: Id) -> Reshare {
|
||||
let user = User::from_url(conn, announce.announce_props.actor.as_str().unwrap().to_string());
|
||||
let post = Post::find_by_ap_url(conn, announce.announce_props.object.as_str().unwrap().to_string());
|
||||
let user = User::from_url(conn, announce.announce_props.actor_link::<Id>().expect("Reshare::from_activity: actor error").into());
|
||||
let post = Post::find_by_ap_url(conn, announce.announce_props.object_link::<Id>().expect("Reshare::from_activity: object error").into());
|
||||
let reshare = Reshare::insert(conn, NewReshare {
|
||||
post_id: post.unwrap().id,
|
||||
user_id: user.unwrap().id,
|
||||
|
Loading…
Reference in New Issue
Block a user