Merge branch 'master' of github.com:Plume-org/Plume

This commit is contained in:
Bat 2018-09-02 22:16:48 +01:00
commit 84b4ab10ec

View File

@ -6,10 +6,11 @@ In order to be installed and to work correctly, Plume needs:
- *Git* (to get the code) - *Git* (to get the code)
- *Curl* (for RustUp, the Rust installer) - *Curl* (for RustUp, the Rust installer)
- *GCC* (to compile C dependencies) - *GCC* and *make* (to compile C dependencies)
- *PostgreSQL* (for the database) - *PostgreSQL* (for the database)
- *GetText* (to manage translations) - *GetText* (to manage translations)
- *Rust* and *Cargo* (to build the code) - *Rust* and *Cargo* (to build the code)
- *OpenSSL* and *OpenSSL librairies* (for security)
All the following instructions will need a terminal. All the following instructions will need a terminal.
@ -20,30 +21,27 @@ On **Debian**:
```bash ```bash
apt update apt update
apt install gettext postgresql postgresql-contrib libpq-dev git apt install gettext postgresql postgresql-contrib libpq-dev git curl gcc make openssl libssl-dev
``` ```
On **Fedora**, **CentOS** or **RHEL**: On **Fedora**, **CentOS** or **RHEL**:
```bash ```bash
dnf install postgresql-server postgresql-contrib mariadb-devel libsq3-devel libpqxx libpqxx-devel dnf install postgresql-server postgresql-contrib mariadb-devel libsq3-devel libpqxx libpqxx-devel git curl gcc make openssl openssl-devel gettext
# TODO: GetText + Git install
``` ```
On **Gentoo**: On **Gentoo**:
```bash ```bash
emerge --sync emerge --sync
emerge -av postgresql eselect-postgresql emerge -av postgresql eselect-postgresql gettext && emerge --ask dev-vcs/git
# TODO: GetText + Git install
``` ```
On **Mac OS X**, with [Homebrew](https://brew.sh/): On **Mac OS X**, with [Homebrew](https://brew.sh/):
```bash ```bash
brew update brew update
brew install postgres brew install postgres gettext git
# TODO: GetText + Git install
``` ```
## Creating a new user (optional) ## Creating a new user (optional)
@ -271,55 +269,107 @@ WantedBy=multi-user.target
This script can also be useful if you are using SysVinit. This script can also be useful if you are using SysVinit.
```bash ```bash
#!/bin/bash #!/bin/sh
# ### BEGIN INIT INFO
# chkconfig: 35 90 12 # Provides:
# description: Plume # Required-Start: $remote_fs $syslog
# # Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Start daemon at boot time
# Description: Federated blogging
# Based on https://raw.githubusercontent.com/fhd/init-script-template/master/template
### END INIT INFO
# Get function from functions library dir="/home/plume/Plume"
. /etc/init.d/functions cmd="/home/plume/.cargo/bin/cargo run"
user="plume"
# Start Plume name=`basename $0`
start() { pid_file="/var/run/$name.pid"
initlog -c "echo -n Démarrage de Plume: " stdout_log="/home/plume/Plume/plume.log"
cd /home/plume/Plume & cargo run stderr_log="/home/plume/Plume/plume.err"
### Create the lock file ###
touch /var/lock/subsys/plume get_pid() {
success $"Plume est prêt !" cat "$pid_file"
echo
} }
# Restart Plume is_running() {
stop() { [ -f "$pid_file" ] && ps -p `get_pid` > /dev/null 2>&1
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 case "$1" in
start) start)
start if is_running; then
;; echo "Already started"
stop) else
stop echo "Starting $name"
;; cd "$dir"
status) if [ -z "$user" ]; then
status FOO sudo $cmd >> "$stdout_log" 2>> "$stderr_log" &
;; else
restart|reload|condrestart) sudo -u "$user" $cmd >> "$stdout_log" 2>> "$stderr_log" &
stop fi
start echo $! > "$pid_file"
;; if ! is_running; then
*) echo "Unable to start, see $stdout_log and $stderr_log"
echo $"Usage: $0 {start|stop|restart|reload|status}" exit 1
fi
fi
;;
stop)
if is_running; then
echo -n "Stopping $name.."
kill `get_pid`
for i in 1 2 3 4 5 6 7 8 9 10
# for i in `seq 10`
do
if ! is_running; then
break
fi
echo -n "."
sleep 1
done
echo
if is_running; then
echo "Not stopped; may still be shutting down or shutdown may have failed"
exit 1
else
echo "Stopped"
if [ -f "$pid_file" ]; then
rm "$pid_file"
fi
fi
else
echo "Not running"
fi
;;
restart)
$0 stop
if is_running; then
echo "Unable to stop, will not attempt to start"
exit 1 exit 1
fi
$0 start
;;
status)
if is_running; then
echo "Running"
else
echo "Stopped"
exit 1
fi
;;
*)
echo "Usage: $0 {start|stop|restart|status}"
exit 1
;;
esac esac
exit 0 exit 0
``` ```
## Caveats: ## Caveats: