YunoHost-Apps/movim_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/movim_ynh.git synced 2024-09-03 19:46:19 +02:00
Code Issues Activity Actions

Add movim daemon port choice

Browse source
This commit is contained in:
src386 2015-08-10 17:28:11 +02:00
parent 38a00c31cb
commit 5a640e0c9e
7 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -3,4 +3,9 @@ Movim for Yunohost.
Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol. Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol.
PACKAGE NOT READY YET
DO NOT USE
**Changelog**
Current Movim version : 20150731. Current Movim version : 20150731.

1
TODO
View file

@ -1,4 +1,3 @@
- SSO / no SSO distinction
- Change port ? - Change port ?
- SHA password - SHA password
- URL rewriting - URL rewriting

2
conf/movim.init
View file

@ -10,7 +10,7 @@
### END INIT INFO ### END INIT INFO
dir="YHDIR" dir="YHDIR"
cmd="php daemon.php https://YHURL 8080" cmd="php daemon.php https://YHURL YHPORT"
user="www-data" user="www-data"
name=`basename $0` name=`basename $0`

2
conf/movim.service
View file

@ -5,7 +5,7 @@ After=nginx.service network.target local-fs.target
[Service] [Service]
User=www-data User=www-data
Type=simple Type=simple
ExecStart=/usr/bin/php daemon.php https://YHURL 8080 ExecStart=/usr/bin/php daemon.php https://YHURL YHPORT
WorkingDirectory=YHDIR WorkingDirectory=YHDIR
[Install] [Install]

2
conf/nginx.conf
View file

@ -19,7 +19,7 @@ location PATHTOCHANGE {
} }
location ~ ^PATHTOCHANGE/ws/ { location ~ ^PATHTOCHANGE/ws/ {
proxy_pass http://localhost:8080; proxy_pass http://localhost:YHPORT;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";

10
manifest.json
View file

@ -66,7 +66,15 @@
}, },
"choices": ["Yes", "No"], "choices": ["Yes", "No"],
"default": "No" "default": "No"
} },
{
"name": "port",
"ask": {
"en": "Movim daemon port ? (internal only)",
"fr": "Port privé pour Movim ? (interne uniquement)"
},
"example": "9537"
},
] ]
} }
} }

3
scripts/install
View file

@ -7,6 +7,7 @@ admin=$3
password=$4 password=$4
language=$5 language=$5
public_site=$6 public_site=$6
port=$7
# Check domain/path availability # Check domain/path availability
sudo yunohost app checkurl $domain$path -a movim sudo yunohost app checkurl $domain$path -a movim
@ -58,6 +59,7 @@ sudo yunohost app addaccess movim -u $admin
# Copy init script or systemd service # Copy init script or systemd service
sudo sed -i "s@YHURL@$domain$path@g" ../conf/movim.{service,init} sudo sed -i "s@YHURL@$domain$path@g" ../conf/movim.{service,init}
sudo sed -i "s@YHDIR@$final_path@g" ../conf/movim.{service,init} sudo sed -i "s@YHDIR@$final_path@g" ../conf/movim.{service,init}
sudo sed -i "s@YHPORT@$port@g" ../conf/movim.{service,init}
if [ `pgrep -ox systemd` = "1" ]; if [ `pgrep -ox systemd` = "1" ];
then then
sudo cp ../conf/movim.service /lib/systemd/system/ sudo cp ../conf/movim.service /lib/systemd/system/
@ -73,6 +75,7 @@ fi
# Nginx configuration # Nginx configuration
sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf
sed -i "s@YHPORT@$port@g" ../conf/nginx.conf
sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/movim.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/movim.conf
# SSOwat Configuration # SSOwat Configuration