fix usage of new repo utils, refs #13

Signed-off-by: morph027 <stefan.heitmueller@gmx.com>

.gitlab-ci.yml

@@ -1,128 +1,191 @@
+---
 stages:
   - package
   - test
   - repo
   - pages
 
-package:
+.vars: &vars
+  NAME: gitea
+  URL: "https://gitea.io"
+  DESCRIPTION: "A painless self-hosted Git service."
+  ARTIFACTS: "usr"
+
+.package: &package
   stage: package
   image: golang:latest
-  variables:
-    NAME: gitea
-    URL: "https://gitea.io"
-    DESCRIPTION: "A painless self-hosted Git service."
-    ARTIFACTS: "usr"
   script:
-    - export VERSION=$(echo ${CI_COMMIT_TAG#*v} | cut -d'-' -f1)
+    - export VERSION=$(echo ${CI_COMMIT_TAG#*v} | cut -d'+' -f1)
-    - export PATCHLEVEL=$(echo ${CI_COMMIT_TAG} | cut -d'-' -f2)
+    - export PATCHLEVEL=$(echo ${CI_COMMIT_TAG} | cut -d'+' -f2)
     - apt-get -qq update
     - apt-get -qqy install ruby-dev ruby-ffi curl file
-    - gem install specific_install
+    - gem install fpm
-    - gem specific_install https://github.com/root360/fpm.git all_fixes
     - mkdir -p "${CI_PROJECT_DIR}/package_root/usr/bin"
-    - curl -sL -o "${CI_PROJECT_DIR}/package_root/usr/bin/gitea" "https://dl.gitea.io/gitea/${VERSION}/gitea-${VERSION}-linux-amd64"
+    - echo "https://dl.gitea.com/gitea/${VERSION}/gitea-${VERSION}-linux-${ARCH}"
-    - file --mime-type --brief "${CI_PROJECT_DIR}/package_root/usr/bin/gitea" | grep -q 'application/x-executable'
+    - curl -sL -o
+        "${CI_PROJECT_DIR}/package_root/usr/bin/gitea"
+        "https://dl.gitea.com/gitea/${VERSION}/gitea-${VERSION}-linux-${ARCH}"
+    - file
+        --mime-type
+        --brief
+        "${CI_PROJECT_DIR}/package_root/usr/bin/gitea"
+        | grep -q 'application/x-executable'
     - chmod +x "${CI_PROJECT_DIR}/package_root/usr/bin/gitea"
+    - gem install fpm
     - fpm
+        --architecture "${ARCH}"
         --input-type dir
         --output-type deb
-        --package "${CI_PROJECT_DIR}/gitea_${VERSION}-${PATCHLEVEL}_amd64.deb"
+        --package "${CI_PROJECT_DIR}/gitea_${VERSION}+${PATCHLEVEL}_${ARCH}.deb"
         --name "${NAME}"
-        --version "${VERSION}-${PATCHLEVEL}"
+        --version "${VERSION}+${PATCHLEVEL}"
         --description "${DESCRIPTION}"
         --maintainer "Stefan Heitmüller <stefan.heitmueller@gmx.com>"
         --url "${URL}"
         --depends git
-        --deb-systemd "${CI_PROJECT_DIR}/package_scripts/${NAME}.service"
+        --deb-recommends morph027-keyring
-        --deb-systemd-enable
+        --deb-systemd "${CI_PROJECT_DIR}/.packaging/${NAME}.service"
-        --deb-systemd-auto-start
         --deb-activate-noawait /etc/init.d
         --prefix=/
-        --after-install "${CI_PROJECT_DIR}/package_scripts/after-install.sh"
+        --before-install "${CI_PROJECT_DIR}/.packaging/before-install.sh"
         --chdir "${CI_PROJECT_DIR}/package_root"
         $ARTIFACTS
   artifacts:
     paths:
       - $CI_PROJECT_DIR/*.deb
+    expire_in: 7 days
+
+.manual: &manual
+  when: manual
   only:
     - tags
 
-test-install:
+.trigger: &trigger
+  when: delayed
+  start_in: 2 hours
+  only:
+    - triggers
+
+gitea-amd64-tag:
+  <<: [*package, *manual]
+  variables:
+    <<: *vars
+    ARCH: amd64
+
+gitea-amd64-trigger:
+  <<: [*package, *trigger]
+  variables:
+    <<: *vars
+    ARCH: amd64
+
+gitea-arm64-tag:
+  <<: [*package, *manual]
+  variables:
+    <<: *vars
+    ARCH: arm64
+
+gitea-arm64-trigger:
+  <<: [*package, *trigger]
+  variables:
+    <<: *vars
+    ARCH: arm64
+
+.test-install: &test-install
   stage: test
-  image: docker:latest
+  image: ubuntu:noble
-  services:
-    - docker:dind
   script:
-    - docker run
+    - ./.gitlab-ci/test-install.sh
-      -d
-      --name systemd-ubuntu
-      --privileged
-      -v /sys/fs/cgroup:/sys/fs/cgroup:ro
-      -v $CI_PROJECT_DIR:/src
-      -e CI_PROJECT_DIR=/src
-      -e CI_COMMIT_TAG=$CI_COMMIT_TAG
-      jrei/systemd-ubuntu:20.04
-    - docker exec -t systemd-ubuntu /bin/bash /src/.gitlab-ci/test-install.sh
-  only:
-    - tags
 
-test-update:
+.test-update: &test-update
   stage: test
-  image: docker:latest
+  image: ubuntu:noble
-  services:
-    - docker:dind
   script:
-    - docker run
+    - ./.gitlab-ci/test-update.sh
-      -d
+
-      --name systemd-ubuntu
+test-install-trigger:
-      --privileged
+  <<: *test-install
-      -v /sys/fs/cgroup:/sys/fs/cgroup:ro
+  needs:
-      -v $CI_PROJECT_DIR:/src
+    - gitea-amd64-trigger
-      -e CI_PROJECT_DIR=/src
+  only:
-      -e CI_COMMIT_TAG=$CI_COMMIT_TAG
+    - trigger
-      jrei/systemd-ubuntu:20.04
+
-    - docker exec -t systemd-ubuntu /bin/bash /src/.gitlab-ci/test-update.sh
+test-install-tag:
+  <<: *test-install
+  needs:
+    - gitea-amd64-tag
   only:
     - tags
 
-reprepro:
+test-update-trigger:
+  <<: *test-update
+  needs:
+    - gitea-amd64-trigger
+  only:
+    - trigger
+
+test-update-tag:
+  <<: *test-update
+  needs:
+    - gitea-amd64-tag
+  only:
+    - tags
+
+.repro: &repo
   cache:
     untracked: true
     paths:
-      - $CI_PROJECT_DIR/repo
+      - $CI_PROJECT_DIR/.repo
-    key: reprepro
+    key: repo
   stage: repo
-  image: registry.gitlab.com/packaging/reprepro-multiple-versions:latest
+  image: registry.gitlab.com/packaging/utils:latest
   script:
-    - echo "$SIGNING_KEY" > /tmp/key
+    - /deb.sh gitea
-    - gpg --import /tmp/key
+
-    - rm -f /tmp/key
+repo-apt-tag:
-    - test -f $CI_PROJECT_DIR/repo/gpg.key || gpg --export --armor "$SIGNING_KEY_ID" > $CI_PROJECT_DIR/repo/gpg.key
+  <<: [*repo]
-    - sed -i 's,##SIGNING_KEY_ID##,'$SIGNING_KEY_ID',' repo/conf/distributions
+  needs:
-    - find $CI_PROJECT_DIR -type f -name "*.deb" -exec
+    - gitea-amd64-tag
-        reprepro
+    - gitea-arm64-tag
-        -b $CI_PROJECT_DIR/repo
+    - test-install-tag
-        includedeb
+    - test-update-tag
-        gitea
+  rules:
-        {} \+;
+    - if: $CI_COMMIT_TAG && $CI_PIPELINE_SOURCE != "trigger"
-  only:
+
-    - tags
+
+repo-apt-trigger:
+  <<: [*repo]
+  needs:
+    - gitea-amd64-trigger
+    - gitea-arm64-trigger
+    - test-install-trigger
+    - test-update-trigger
+  rules:
+    - if: $CI_COMMIT_TAG && $CI_PIPELINE_SOURCE == "trigger"
 
 pages:
   cache:
     untracked: true
     paths:
-      - $CI_PROJECT_DIR/repo
+      - $CI_PROJECT_DIR/.repo
-    key: reprepro
+    key: repo
     policy: pull
   stage: pages
   image: ubuntu:focal
+  needs:
+    - job: repo-apt-tag
+      optional: true
+    - job: repo-apt-trigger
+      optional: true
   script:
     - mkdir $CI_PROJECT_DIR/public
-    - cp -r $CI_PROJECT_DIR/repo/gpg.key $CI_PROJECT_DIR/repo/dists $CI_PROJECT_DIR/repo/pool $CI_PROJECT_DIR/public/
+    - cp -rv
+        $CI_PROJECT_DIR/.repo/deb/gpg.key
+        $CI_PROJECT_DIR/.repo/deb/gitea/gitea/{dists,pool}
+        $CI_PROJECT_DIR/public/
   artifacts:
     paths:
       - $CI_PROJECT_DIR/public
     expire_in: 1 day
   only:
     - tags
+    - triggers

.gitlab-ci/init

@@ -0,0 +1,84 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          gitea
+# Required-Start:    $syslog $network
+# Required-Stop:     $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: A self-hosted Git service written in Go.
+# Description:       A self-hosted Git service written in Go.
+### END INIT INFO
+
+# Do NOT "set -e"
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+DESC="Gitea - Git with a cup of tea"
+NAME=gitea
+SERVICEVERBOSE=yes
+PIDFILE=/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+WORKINGDIR=/var/lib/$NAME
+DAEMON=/usr/bin/$NAME
+DAEMON_ARGS="web -c /etc/$NAME/app.ini"
+USER=gitea
+STOP_SCHEDULE="${STOP_SCHEDULE:-QUIT/5/TERM/1/KILL/5}"
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+do_start()
+{
+    GITEA_ENVS="USER=$USER GITEA_WORK_DIR=$WORKINGDIR HOME=/var/lib/$USER"
+    GITEA_EXEC="$DAEMON -- $DAEMON_ARGS"
+    sh -c "start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \\
+        --background --chdir $WORKINGDIR --chuid $USER \\
+        --exec /bin/bash -- -c '/usr/bin/env $GITEA_ENVS $GITEA_EXEC'"
+}
+
+do_stop()
+{
+    start-stop-daemon --stop --quiet --retry=$STOP_SCHEDULE --pidfile $PIDFILE --name $NAME --oknodo
+    rm -f $PIDFILE
+}
+
+do_status()
+{
+    if [ -f $PIDFILE ]; then
+        if kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
+            echo "$NAME is running, PID is $(cat $PIDFILE)"
+        else
+            echo "$NAME process is dead, but pidfile exists"
+        fi
+    else
+        echo "$NAME is not running"
+    fi
+}
+
+case "$1" in
+    start)
+        echo "Starting $DESC" "$NAME"
+        do_start
+        ;;
+    stop)
+        echo "Stopping $DESC" "$NAME"
+        do_stop
+        ;;
+    status)
+        do_status
+        ;;
+    restart)
+        echo "Restarting $DESC" "$NAME"
+        do_stop
+        do_start
+        ;;
+    *)
+        echo "Usage: $SCRIPTNAME {start|stop|status|restart}" >&2
+        exit 2
+        ;;
+esac
+
+exit 0

.gitlab-ci/test-install.sh

@@ -2,5 +2,5 @@
 
 . "${CI_PROJECT_DIR}/.gitlab-ci/test.sh"
 
-apt-get -y install "${CI_PROJECT_DIR}/gitea_${VERSION}-${PATCHLEVEL}_amd64.deb"
+apt-get -y install "${CI_PROJECT_DIR}/gitea_${VERSION}+${PATCHLEVEL}_amd64.deb"
 start_gitea

.gitlab-ci/test-update.sh

@@ -6,9 +6,9 @@ curl -sL -o /etc/apt/trusted.gpg.d/morph027-gitea.asc https://packaging.gitlab.i
 echo "deb [arch=amd64] https://packaging.gitlab.io/gitea gitea main" > /etc/apt/sources.list.d/morph027-gitea.list
 apt-get update
 apt-get -y install gitea
-cp "/${CI_PROJECT_DIR}/.gitlab-ci/app.ini" /etc/gitea/app.ini
+install -o gitea -g gitea -m 644 "/${CI_PROJECT_DIR}/.gitlab-ci/app.ini" /etc/gitea/app.ini
 start_gitea
 curl -s localhost:3000/api/v1/version | jq -e '.version'
-apt-get -y --allow-downgrades install "${CI_PROJECT_DIR}/gitea_${VERSION}-${PATCHLEVEL}_amd64.deb"
+apt-get -y --allow-downgrades install "${CI_PROJECT_DIR}/gitea_${VERSION}+${PATCHLEVEL}_amd64.deb"
 restart_gitea
 curl -s localhost:3000/api/v1/version | jq -e '.version'

.gitlab-ci/test.sh

@@ -2,20 +2,24 @@
 
 set -e
 
-VERSION=$(echo "${CI_COMMIT_TAG#*v}" | cut -d'-' -f1)
+VERSION=$(echo "${CI_COMMIT_TAG#*v}" | cut -d'+' -f1)
-PATCHLEVEL=$(echo "${CI_COMMIT_TAG}" | cut -d'-' -f2)
+PATCHLEVEL=$(echo "${CI_COMMIT_TAG}" | cut -d'+' -f2)
 export VERSION PATCHLEVEL
 
+if [ ! -f /etc/init.d/gitea ]; then
+    cp -v "${CI_PROJECT_DIR}"/.gitlab-ci/init /etc/init.d/gitea
+fi
+
 start_gitea() {
-  systemctl start gitea
+  /etc/init.d/gitea start
   sleep 10
-  if ! systemctl is-active gitea; then
+  if ! /etc/init.d/gitea status | grep 'gitea is running'; then
-    journalctl -lu gitea --no-pager
+    cat /var/lib/gitea/log/gitea.log
   fi
 }
 
 restart_gitea() {
-  systemctl stop gitea
+  /etc/init.d/gitea stop
   start_gitea
 }
 

.packaging/gitea.service

@@ -3,13 +3,13 @@ Description=Gitea (Git with a cup of tea)
 After=network.target
 
 [Service]
-RestartSec=2s
+RestartSec=30s
 Type=simple
 User=gitea
 Group=gitea
 WorkingDirectory=/var/lib/gitea/
 ExecStart=/usr/bin/gitea web -c /etc/gitea/app.ini
-Restart=always
+Restart=on-failure
 Environment="GITEA_WORK_DIR=/var/lib/gitea/"
 EnvironmentFile=-/etc/default/gitea
 

.repo/gitea/conf/distributions

@@ -1,5 +1,8 @@
+Origin: morph027
+Suite: gitea
+Label: gitea
 Codename: gitea
 Components: main
-Architectures: amd64
+Architectures: amd64 arm64
 SignWith: ##SIGNING_KEY_ID##
 Limit: 0

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 packaging
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -13,19 +13,32 @@ sudo curl -sL -o /etc/apt/trusted.gpg.d/morph027-gitea.asc https://packaging.git
 ### Add repo to apt
 
 ```
-echo "deb [arch=amd64] https://packaging.gitlab.io/gitea gitea main" | sudo tee /etc/apt/sources.list.d/morph027-gitea.list
+echo "deb https://packaging.gitlab.io/gitea gitea main" | sudo tee /etc/apt/sources.list.d/morph027-gitea.list
 ```
 
 ### Install
 
 ```
 sudo apt-get update
-sudo apt-get install gitea
+sudo apt-get install gitea morph027-keyring
 ```
 
 ### Start
 
 ```
-systemctl start gitea
+systemctl enable --now gitea
-systemctl enable gitea
+```
+
+## Extras
+
+### unattended-upgrades
+
+To enable automatic upgrades using `unattended-upgrades`, just add the following config file:
+
+```bash
+cat > /etc/apt/apt.conf.d/50gitea <<EOF
+Unattended-Upgrade::Allowed-Origins {
+	"morph027:gitea";
+};
+EOF
 ```