GLiCID/forgejo-deb
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

Merge branch 'main' into pr/self-hosted-tests-2

Browse source
This commit is contained in:
crystal 2024-04-30 22:14:54 +00:00
commit 11a6343eb3
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.ci-make.sh
View file

@ -97,13 +97,13 @@ case "$1" in
git describe --tags HEAD git describe --tags HEAD
CI_COMMIT_TAG_RESOLVE=$(git describe --tags HEAD --abbrev=0) CI_COMMIT_TAG_RESOLVE=$(git describe --tags HEAD --abbrev=0)
echo "Closest existing tag: $CI_COMMIT_TAG_RESOLVE" echo "Closest existing tag: $CI_COMMIT_TAG_RESOLVE"
if [ "$CI_COMMIT_TAG_RESOLVE" = *"-dev" ] ; then if [ "$CI_COMMIT_TAG_RESOLVE" != "${CI_COMMIT_TAG_RESOLVE%"-dev"}" ] || [ ! "$CI_COMMIT_TAG_RESOLVE" ] ; then
if [ $PR_MODE ] ; then if [ $PR_MODE ] ; then
echo "I can't figure out which release version of Forgejo to build your PR against." echo "I can't figure out which release version of Forgejo to build your PR against."
echo "Whatever you're trying to do is not yet implemented." echo "Whatever you're trying to do is not yet implemented."
exit 97 exit 97
fi fi
echo "err! building dev version- skipping binary dl" echo "err! unable to resolve tag or building dev version- skipping binary dl"
CI_COMMIT_TAG_RESOLVE= CI_COMMIT_TAG_RESOLVE=
fi fi
fi fi
@ -186,7 +186,7 @@ case "$1" in
[ -z "$FORGEJO_HOME" ] && FORGEJO_HOME=/var/lib/forgejo [ -z "$FORGEJO_HOME" ] && FORGEJO_HOME=/var/lib/forgejo
[ -z "$FORGEJO_USER" ] && FORGEJO_USER=forgejo [ -z "$FORGEJO_USER" ] && FORGEJO_USER=forgejo
sudo -u $FORGEJO_USER USER=$FORGEJO_USER \ sudo -u $FORGEJO_USER USER=$FORGEJO_USER \
HOME=$FORGEJO_HOME GITEA_WORK_DIR=$FORGEJO_HOME \ HOME=$FORGEJO_HOME FORGEJO_WORK_DIR=$FORGEJO_HOME \
forgejo web -q --config /etc/forgejo/app.ini & forgejo web -q --config /etc/forgejo/app.ini &
sleep 10 sleep 10
curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo" curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo"
@ -202,7 +202,7 @@ case "$1" in
apt update -qq apt update -qq
apt install -y "$3" apt install -y "$3"
sudo -u forgejo USER=forgejo \ sudo -u forgejo USER=forgejo \
HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo \ HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo \
forgejo web -q --config /etc/fogejo/app.ini & forgejo web -q --config /etc/fogejo/app.ini &
sleep 10 sleep 10
curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo" curl http://localhost:3000/ | grep -A 4 "Powered by Forgejo"

4
deb/.forgejo-bin.control
View file

@ -2,7 +2,7 @@ Package: forgejo-bin
Architecture: amd64 Architecture: amd64
Priority: optional Priority: optional
Provides: forgejo,gitea Provides: forgejo,gitea
Depends: adduser (>= 3.11) Depends: adduser (>= 3.11), git
Conflicts: forgejo,forgejo-bin Conflicts: forgejo,forgejo-sqlite,forgejo-common
Description: Forgejo: Beyond Coding. We Forge. (binary) Description: Forgejo: Beyond Coding. We Forge. (binary)
The official Forgejo release binary in a Debian package The official Forgejo release binary in a Debian package

2
deb/forgejo.service
View file

@ -61,7 +61,7 @@ WorkingDirectory=~
#RuntimeDirectory=forgejo #RuntimeDirectory=forgejo
ExecStart=/usr/bin/forgejo web --config /etc/forgejo/app.ini ExecStart=/usr/bin/forgejo web --config /etc/forgejo/app.ini
Restart=always Restart=always
Environment=USER=forgejo HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo Environment=USER=forgejo HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo
# If you install Git to directory prefix other than default PATH (which happens # If you install Git to directory prefix other than default PATH (which happens
# for example if you install other versions of Git side-to-side with # for example if you install other versions of Git side-to-side with
# distribution version), uncomment below line and add that prefix to PATH # distribution version), uncomment below line and add that prefix to PATH

2
etc/systemd/system/forgejo.service.d/override.conf
View file

@ -3,4 +3,4 @@
# LimitNOFILE=524288:524288 # LimitNOFILE=524288:524288
User=git User=git
Group=git Group=git
Environment=USER=git HOME=/var/lib/forgejo GITEA_WORK_DIR=/var/lib/forgejo Environment=USER=git HOME=/var/lib/forgejo FORGEJO_WORK_DIR=/var/lib/forgejo