diff --git a/manifest.json b/manifest.json index 5871ba0..f3a405c 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name": "Jenkins", "id": "jenkins", "description": { - "en": "Jenkins", - "fr": "Jenkins" + "en": "Serveur d'intégration continue extensible", + "fr": "Extendable continuous integration server" }, "developer": { "name": "Julien Malik", @@ -33,4 +33,3 @@ } } - diff --git a/scripts/install b/scripts/install index 502721c..6fb618d 100644 --- a/scripts/install +++ b/scripts/install @@ -17,7 +17,7 @@ if [[ ! $? -eq 0 ]]; then fi echo "Install dependencies..." -wget -q -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | sudo apt-key add - +wget -q -O - "http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key" | sudo apt-key add - sudo bash -c "cat > /etc/apt/sources.list.d/jenkins.list << EOF deb http://pkg.jenkins-ci.org/debian binary/ EOF diff --git a/scripts/remove b/scripts/remove index d09079f..30ce537 100644 --- a/scripts/remove +++ b/scripts/remove @@ -2,6 +2,10 @@ domain=$(sudo yunohost app setting jenkins domain) +sudo rm /etc/nginx/conf.d/$domain/jenkins.conf +sudo yunohost ssowatconf +sudo service nginx reload + sudo yunohost service remove ynh-jenkins sudo apt-get purge jenkins diff --git a/scripts/upgrade b/scripts/upgrade index dcfd408..18acaa4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -5,4 +5,8 @@ domain=$(sudo yunohost app setting jenkins domain) path=$(sudo yunohost app setting jenkins path) path=${path%/} -# TODO +sed -i "s@YNH_LOCATION@$path@g" ../conf/nginx.conf +sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/jenkins.conf +sudo service nginx reload +sudo yunohost app ssowatconf +