mirror of
https://github.com/YunoHost-Apps/garradin_ynh.git
synced 2024-09-03 18:36:17 +02:00
delete php.ini not used and add the values (commented) on php_fpm.conf
This commit is contained in:
parent
f4a762cd6c
commit
6273c8bb65
4 changed files with 74 additions and 12 deletions
|
@ -390,3 +390,14 @@ catch_workers_output = yes
|
||||||
;php_admin_value[error_log] = /var/log/fpm-php.www.log
|
;php_admin_value[error_log] = /var/log/fpm-php.www.log
|
||||||
;php_admin_flag[log_errors] = on
|
;php_admin_flag[log_errors] = on
|
||||||
;php_admin_value[memory_limit] = 32M
|
;php_admin_value[memory_limit] = 32M
|
||||||
|
|
||||||
|
; Common values to change to increase file upload limit
|
||||||
|
; php_value[upload_max_filesize] = 50M
|
||||||
|
; php_value[post_max_size] = 50M
|
||||||
|
; php_valuemail.add_x_header = Off
|
||||||
|
|
||||||
|
; Other common parameters
|
||||||
|
; php_value[max_execution_time] = 600
|
||||||
|
; php_value[max_input_time] = 300
|
||||||
|
; php_value[memory_limit] = 256M
|
||||||
|
; php_value[short_open_tag] = On
|
|
@ -1,10 +0,0 @@
|
||||||
; Common values to change to increase file upload limit
|
|
||||||
; upload_max_filesize = 50M
|
|
||||||
; post_max_size = 50M
|
|
||||||
; mail.add_x_header = Off
|
|
||||||
|
|
||||||
; Other common parameters
|
|
||||||
; max_execution_time = 600
|
|
||||||
; max_input_time = 300
|
|
||||||
; memory_limit = 256M
|
|
||||||
; short_open_tag = On
|
|
|
@ -3,7 +3,7 @@
|
||||||
"id": "garradin",
|
"id": "garradin",
|
||||||
"packaging_format": 1,
|
"packaging_format": 1,
|
||||||
"requirements": {
|
"requirements": {
|
||||||
"yunohost": ">= 2.7.2"
|
"yunohost": "3.5.0"
|
||||||
},
|
},
|
||||||
"description": {
|
"description": {
|
||||||
"en": "Software to manage association",
|
"en": "Software to manage association",
|
||||||
|
|
61
script_jenkins.sh
Normal file
61
script_jenkins.sh
Normal file
|
@ -0,0 +1,61 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Usage:
|
||||||
|
# send_to_dev_ci.sh
|
||||||
|
# Use without arguments, the script will use the static list at the end of script
|
||||||
|
#
|
||||||
|
# send_to_dev_ci.sh my_app my_other_app "the directory/which/contains/my_third_app"
|
||||||
|
# Use with arguments, each argument will be considered as an app to send to the CI.
|
||||||
|
|
||||||
|
# Get the path of this script
|
||||||
|
script_dir="$(dirname "$(realpath "$0")")"
|
||||||
|
|
||||||
|
# Get potential arguments and store them into an array
|
||||||
|
if [ $# -ge 1 ]
|
||||||
|
then
|
||||||
|
folders_to_send=("$@")
|
||||||
|
fi
|
||||||
|
|
||||||
|
ssh_user=rodinux
|
||||||
|
ssh_host=ci-apps-dev.yunohost.org
|
||||||
|
ssh_port=22
|
||||||
|
ssh_key=~/.ssh/id_rsa
|
||||||
|
distant_dir=/data
|
||||||
|
SSHSOCKET=~/.ssh/ssh-socket-%r-%h-%p
|
||||||
|
|
||||||
|
SEND_TO_CI () {
|
||||||
|
echo "============================"
|
||||||
|
echo ">>> Sending $1"
|
||||||
|
rsync -avzhuE -c --progress --delete --exclude=".git" "${1%/}" -e "ssh -i $ssh_key -p $ssh_port -o ControlPath=$SSHSOCKET" $ssh_user@$ssh_host:"$distant_dir/"
|
||||||
|
echo "============="
|
||||||
|
echo "Build should show up here once it starts:"
|
||||||
|
echo "https://$ssh_host/jenkins/view/$ssh_user/job/$(basename "${1%/}")%20($ssh_user)/lastBuild/console"
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "Opening connection"
|
||||||
|
ssh $ssh_user@$ssh_host -p $ssh_port -i $ssh_key -f -M -N -o ControlPath=$SSHSOCKET
|
||||||
|
if [ "$?" -ne 0 ]
|
||||||
|
then
|
||||||
|
# If the user wait too long, the connection will fail.
|
||||||
|
# Same player try again
|
||||||
|
ssh $ssh_user@$ssh_host -p $ssh_port -i $ssh_key -f -M -N -o ControlPath=$SSHSOCKET
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If the script has arguments, use them
|
||||||
|
if [ -n "$folders_to_send" ]
|
||||||
|
then
|
||||||
|
# Read each arguments separately
|
||||||
|
for folder in "${folders_to_send[@]}"
|
||||||
|
do
|
||||||
|
SEND_TO_CI "$folder"
|
||||||
|
done
|
||||||
|
|
||||||
|
# Otherwise, without arguments, use the static list
|
||||||
|
else
|
||||||
|
SEND_TO_CI "$script_dir/garradin_ynh"
|
||||||
|
SEND_TO_CI "$script_dir/APP2"
|
||||||
|
SEND_TO_CI "$script_dir/APP3"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Closing connection"
|
||||||
|
ssh $ssh_user@$ssh_host -p $ssh_port -i $ssh_key -S $SSHSOCKET -O exit
|
Loading…
Reference in a new issue