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

Moar architecture cleaning

Browse source
This commit is contained in:
Alexandre Aubin 2017-08-31 00:35:22 +02:00
parent bee4cabad2
commit 392c0c6481
14 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/config
View file

@ -22,9 +22,8 @@ DEFAULT_ARCH="amd64"
HOME_VINAIGRETTE="/home/vinaigrette" HOME_VINAIGRETTE="/home/vinaigrette"
GIT_REPOS="$HOME_VINAIGRETTE/gitrepos/" GIT_REPOS="$HOME_VINAIGRETTE/gitrepos/"
BUILD_DEB="$HOME_VINAIGRETTE/build_deb"
PBUILDER_HOME="$HOME_VINAIGRETTE/pbuilder/" PBUILDER_HOME="$HOME_VINAIGRETTE/scripts/pbuilder/"
PBUILDER_IMAGES="$HOME_VINAIGRETTE/images/" 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/"
@ -34,6 +33,7 @@ PATATE_REPO_DIR=/var/www/repo/patate
# Scripts # Scripts
BUILD_SOURCES="$PBUILDER_HOME/build-sources" BUILD_SOURCES="$PBUILDER_HOME/build-sources"
INCLUDE_CHANGES="$HOME_VINAIGRETTE/repo/include-changes" BUILD_DEB="$HOME_VINAIGRETTE/scripts/build_deb"
INCLUDE_CHANGES="$HOME_VINAIGRETTE/scripts/repo/include-changes"

4
config/distributions
View file

@ -11,7 +11,7 @@ Description: YunoHost repository for Debian Jessie
SignWith: 59A3E6FF SignWith: 59A3E6FF
Tracking: all includechanges keepsources Tracking: all includechanges keepsources
Log: logfile Log: logfile
--changes --via=include /home/vinaigrette/repo/process-include --changes --via=include /home/vinaigrette/scripts/repo/process-include
Origin: YunoHost Origin: YunoHost
Label: YunoHost for Stretch Label: YunoHost for Stretch
@ -25,4 +25,4 @@ Description: YunoHost repository for Debian Stretch
SignWith: 59A3E6FF SignWith: 59A3E6FF
Tracking: all includechanges keepsources Tracking: all includechanges keepsources
Log: logfile Log: logfile
--changes --via=include /home/vinaigrette/repo/process-include --changes --via=include /home/vinaigrette/scripts/repo/process-include

6
config/rebuildd.conf
View file

@ -3,9 +3,9 @@ check_every = 30
max_threads = 1 max_threads = 1
max_jobs = 5 max_jobs = 5
kill_timeout = 90 kill_timeout = 90
source_cmd = /home/vinaigrette/rebuildd/get-sources ${d} ${p} ${v} source_cmd = /home/vinaigrette/scripts/rebuildd/get-sources ${d} ${p} ${v}
build_cmd = /home/vinaigrette/rebuildd/build-binaries ${d} ${p} ${v} ${a} build_cmd = /home/vinaigrette/scripts/rebuildd/build-binaries ${d} ${p} ${v} ${a}
post_build_cmd = /home/vinaigrette/rebuildd/upload-binaries ${d} ${p} ${v} ${a} ${j} post_build_cmd = /home/vinaigrette/scripts/rebuildd/upload-binaries ${d} ${p} ${v} ${a} ${j}
dists = jessie stretch dists = jessie stretch
work_dir = /var/cache/rebuildd/build work_dir = /var/cache/rebuildd/build
database_uri = sqlite:///var/lib/rebuildd/rebuildd.db database_uri = sqlite:///var/lib/rebuildd/rebuildd.db

2
config/sources.list
View file

@ -1,2 +1,2 @@
deb-src http://repo.yunohost.org/debian jessie stable testing unstable extra deb-src http://repo.yunohost.org/debian jessie stable testing unstable extra
#deb-src http://repo.yunohost.org/debian stretch extra deb-src http://repo.yunohost.org/debian stretch stable testing unstable extra

2
init.sh
View file

@ -21,7 +21,7 @@ ln -s $VINAIGRETTE_HOME/config/distributions /var/www/repo/debian/conf/distribut
rm /etc/rebuildd/rebuilddrc rm /etc/rebuildd/rebuilddrc
ln -s $VINAIGRETTE_HOME/config/rebuildd.conf /etc/rebuildd/rebuilddrc ln -s $VINAIGRETTE_HOME/config/rebuildd.conf /etc/rebuildd/rebuilddrc
ln -s $VINAIGRETTE_HOME/pbuilder/images /var/cache/pbuilder/images ln -s $VINAIGRETTE_HOME/images /var/cache/pbuilder/images
ln -s /var/cache/pbuilder/result $PBUILDER_RESULTS ln -s /var/cache/pbuilder/result $PBUILDER_RESULTS
cp $VINAIGRETTE_HOME/conf/nginx.conf /etc/nginx/sites-enabled/repo.conf cp $VINAIGRETTE_HOME/conf/nginx.conf /etc/nginx/sites-enabled/repo.conf

0
build_deb → scripts/build_deb
View file

0
package_helpers.sh → scripts/package_helpers.sh
View file

0
pbuilder/build-sources → scripts/pbuilder/build-sources
View file

2
rebuildd/build-binaries → scripts/rebuildd/build-binaries
View file

@ -6,7 +6,7 @@ version=$3
arch=$4 arch=$4
source /home/vinaigrette/config/config source /home/vinaigrette/config/config
source /home/vinaigrette/package_helpers.sh source /home/vinaigrette/scripts/package_helpers.sh
# Build only binary-only limited to architecture dependent packages # Build only binary-only limited to architecture dependent packages
DEBBUILDOPTS="-B" DEBBUILDOPTS="-B"

0
rebuildd/get-sources → scripts/rebuildd/get-sources
View file

2
rebuildd/upload-binaries → scripts/rebuildd/upload-binaries
View file

@ -7,7 +7,7 @@ arch=$4
job=$5 job=$5
source /home/vinaigrette/config/config source /home/vinaigrette/config/config
source /home/vinaigrette/package_helpers.sh source /home/vinaigrette/scripts/package_helpers.sh
XMPP_BOT_KEY=$(cat /home/vinaigrette/config/keys/xmppbotkey) XMPP_BOT_KEY=$(cat /home/vinaigrette/config/keys/xmppbotkey)
# Repository codename to add package to # Repository codename to add package to

2
repo/include-changes → scripts/repo/include-changes
View file

@ -5,7 +5,7 @@ distribution=$2
changes_file=$3 changes_file=$3
source /home/vinaigrette/config/config source /home/vinaigrette/config/config
source /home/vinaigrette/package_helpers.sh source /home/vinaigrette/scripts/package_helpers.sh
sudo reprepro -C $distribution -V -b $REPO_DIR include $codename $changes_file sudo reprepro -C $distribution -V -b $REPO_DIR include $codename $changes_file
RET=$? RET=$?

2
repo/move-to-incoming → scripts/repo/move-to-incoming
View file

@ -3,7 +3,7 @@
changes_file=$1 changes_file=$1
source /home/vinaigrette/config/config source /home/vinaigrette/config/config
source /home/vinaigrette/package_helpers.sh source /home/vinaigrette/scripts/package_helpers.sh
INCOMING_DIR=${REPO_DIR}/incoming INCOMING_DIR=${REPO_DIR}/incoming

2
repo/process-include → scripts/repo/process-include
View file

@ -7,7 +7,7 @@ version=$4
changes_file=$5 changes_file=$5
source /home/vinaigrette/config/config source /home/vinaigrette/config/config
source /home/vinaigrette/package_helpers.sh source /home/vinaigrette/scripts/package_helpers.sh
# Only care about packages being added # Only care about packages being added
if [[ $action != accepted ]]; then if [[ $action != accepted ]]; then