diff --git a/conf/nginx.conf b/conf/nginx.conf index f171bf2..86f9cdc 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,5 @@ location YNH_LOCATION { - proxy_pass http://127.0.0.1:8080; + proxy_pass http://127.0.0.1:YNH_PORT; proxy_redirect off; diff --git a/manifest.json b/manifest.json index 704f449..73dd1ec 100644 --- a/manifest.json +++ b/manifest.json @@ -37,6 +37,15 @@ }, "choices": ["Yes", "No"], "default": "Yes" + }, + { + "name": "port", + "ask": { + "en": "Internal running port ?", + "fr": "Port de fonctionnement interne ?" + }, + "example": "8080", + "default": "8080" } ] } diff --git a/scripts/install b/scripts/install index f7f37b3..c1fab09 100644 --- a/scripts/install +++ b/scripts/install @@ -4,10 +4,11 @@ domain=$1 path=$2 is_public=$3 +port=$4 -sudo yunohost app checkport 8080 +sudo yunohost app checkport $port if [[ ! $? -eq 0 ]]; then - echo "Port 8080 is not available. Aborting..." + echo "Port $port is not available. Aborting..." exit 1 fi @@ -32,6 +33,7 @@ then # $ means 'process only the last line' sudo sed -i '$ s@--ajp13Port=$AJP_PORT@--ajp13Port=$AJP_PORT --prefix=$PREFIX@g' /etc/default/jenkins fi +sudo sed -i "s/HTTP_PORT=.*/HTTP_PORT=$port/g" /etc/default/jenkins sudo service jenkins restart @@ -39,6 +41,7 @@ sudo yunohost service add jenkins -l /var/log/jenkins/jenkins.log echo "Nginx configuration (sso disabled)..." sed -i "s@YNH_LOCATION@$path@g" ../conf/nginx.conf +sed -i "s@YNH_PORT@$port@g" ../conf/nginx.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/jenkins.conf sudo yunohost app setting jenkins is_public -v $is_public @@ -47,5 +50,8 @@ then sudo yunohost app setting jenkins unprotected_uris -v "/" fi +# restart 2 times for debug +sudo service jenkins restart + sudo service nginx reload sudo yunohost app ssowatconf diff --git a/scripts/upgrade b/scripts/upgrade index 9a7ae48..b3c3b2c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -5,11 +5,14 @@ domain=$(sudo yunohost app setting jenkins domain) path=$(sudo yunohost app setting jenkins path) path=${path%/} is_public=$(sudo yunohost app setting jenkins is_public) +port=$(sudo yunohost app setting jenkins port) + +sudo sed -i "s/HTTP_PORT=.*/HTTP_PORT=$port/g" /etc/default/jenkins sed -i "s@YNH_LOCATION@$path@g" ../conf/nginx.conf +sed -i "s@YNH_PORT@$port@g" ../conf/nginx.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/jenkins.conf - if [ "$is_public" = "Yes" ]; then sudo yunohost app setting jenkins unprotected_uris -v "/"