YunoHost/vinaigrette
1
0
Fork 0
mirror of https://github.com/YunoHost/vinaigrette.git synced 2024-09-03 20:06:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove patate stuff

Browse source
This commit is contained in:
Alexandre Aubin 2017-08-31 19:55:09 +02:00
parent 0f74b3de1e
commit 07eacebe69
3 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/config
View file

@ -28,7 +28,6 @@ PBUILDER_IMAGES="$HOME_VINAIGRETTE/images/"
PBUILDER_RESULTS="$PBUILDER_HOME/result" PBUILDER_RESULTS="$PBUILDER_HOME/result"
DAILY_PACKAGES="$PBUILDER_HOME/packages/" DAILY_PACKAGES="$PBUILDER_HOME/packages/"
REPO_DIR=/var/www/repo/debian REPO_DIR=/var/www/repo/debian
PATATE_REPO_DIR=/var/www/repo/patate
# Scripts # Scripts

4
init.sh
View file

@ -35,8 +35,8 @@ cp $VINAIGRETTE_HOME/config/nginx.conf /etc/nginx/sites-enabled/repo.conf
cat $VINAIGRETTE_HOME/config/keys/$DEBSIGN_KEYID.pub | apt-key add cat $VINAIGRETTE_HOME/config/keys/$DEBSIGN_KEYID.pub | apt-key add
cat $VINAIGRETTE_HOME/config/sources.list > /etc/apt/sources.list.d/vinaigrette.list cat $VINAIGRETTE_HOME/config/sources.list > /etc/apt/sources.list.d/vinaigrette.list
sed -i "s/__REPO_URL__/$REPO_URL/g" > /etc/nginx/sites-enabled/repo.conf sed -i "s/__REPO_URL__/$REPO_URL/g" /etc/nginx/sites-enabled/repo.conf
sed -i "s/__REPO_URL__/$REPO_URL/g" > /etc/apt/sources.list.d/vinaigrette.list sed -i "s/__REPO_URL__/$REPO_URL/g" /etc/apt/sources.list.d/vinaigrette.list
echo "127.0.0.1 $REPO_URL" >> /etc/hosts echo "127.0.0.1 $REPO_URL" >> /etc/hosts
service nginx reload service nginx reload

14
scripts/rebuildd/upload-binaries
View file

@ -46,12 +46,6 @@ if [ -z "$COMPONENT" ]; then
exit 1 exit 1
fi fi
# Add to patate - soon-deprecated repo
ADD_TO_PATATE=false
if [[ $arch == all ]] && [[ $COMPONENT == "old-stable" ]]; then
ADD_TO_PATATE=true
fi
echo \ echo \
"******************************************************************************" "******************************************************************************"
echo "Adding binary package..." echo "Adding binary package..."
@ -62,11 +56,6 @@ include_to() {
reprepro --waitforlock 6 -b $REPO_DIR -C $COMPONENT include $1 \ reprepro --waitforlock 6 -b $REPO_DIR -C $COMPONENT include $1 \
$CHANGES_FILE > /dev/null 1>&1 || return 1 $CHANGES_FILE > /dev/null 1>&1 || return 1
} }
include_to_patate() {
echo "Adding to soon-deprecated repository in megusta..."
reprepro --waitforlock 6 -b $PATATE_REPO_DIR include megusta \
$CHANGES_FILE > /dev/null 1>&1 || return 1
}
status=0 status=0
if include_to $CODENAME ; then if include_to $CODENAME ; then
@ -76,9 +65,6 @@ if include_to $CODENAME ; then
else else
status=1 status=1
fi fi
if $ADD_TO_PATATE; then
include_to_patate || status=2
fi
if [ $status -eq 0 ]; then if [ $status -eq 0 ]; then
# Clean pbuilder results # Clean pbuilder results