Merge branch 'develop' into dist/eole/2.6.2/develop

Check for version update with script expected version versus installed
version

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,16 @@
+Source: eole-gitea
+Section: web
+Priority: optional
+Maintainer: Cadoles <eole@ac-dijon.fr>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
+Homepage: https://forge.cadoles.com/Cadoles/eole-gitea
+Vcs-Git: https://forge.cadoles.com/Cadoles/eole-gitea.git
+Vcs-Browser: https://forge.cadoles.com/Cadoles/eole-redis
+
+Package: eole-gitea
+Architecture: all
+Depends: ${misc:Depends}, git-core, eole-db, eole-mysql
+Description: Dictionnaires et templates pour la configuration d'un serveur Gitea, testée uniquement avec eolebase
+ .
+ Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles.

debian/copyright

@@ -0,0 +1,44 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: {PROJECT}
+Source: {URL}
+
+Files: *
+Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
+License: {UPSTREAM LICENSE}
+
+Files: debian/*
+Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
+License: CeCILL-2
+
+License: {UPSTREAM LICENSE}
+ {TEXT OF THE LICENSE}
+
+License: CeCILL-2
+ This software is governed by the CeCILL-2 license under French law and
+ abiding by the rules of distribution of free software.  You can  use,
+ modify and or redistribute the software under the terms of the CeCILL-2
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info";.
+ .
+ As a counterpart to the access to the source code and  rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty  and the software's author,  the holder of the
+ economic rights,  and the successive licensors  have only  limited
+ liability.
+ .
+ In this respect, the user's attention is drawn to the risks associated
+ with loading,  using,  modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean  that it is complicated to manipulate,  and  that  also
+ therefore means  that it is reserved for developers  and  experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and,  more generally, to use and operate it in the
+ same conditions as regards security.
+ .
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL-2 license and that you accept its terms.
+ .
+ On Eole systems, the complete text of the CeCILL-2 License can be found
+ in '/usr/share/common-licenses/CeCILL-2-en'.

debian/eole-gitea.forge.service

@@ -0,0 +1 @@
+../systemd/forge.service

debian/gbp.conf

@@ -0,0 +1,3 @@
+# Set per distribution debian tag
+[DEFAULT]
+debian-tag = debian/eole/%(version)s

debian/rules

@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@
+
+# Force init script name
+override_dh_installinit:
+	dh_installinit --noscripts -peole-redis --name=redis2-server $@
+
+override_dh_systemd_enable:
+	dh_systemd_enable -peole-redis --name=redis2-server
+
+override_dh_systemd_start:
+	dh_systemd_start -peole-server --no-start --no-restart-on-upgrade redis2-server

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

pretemplate/01-gitea-init

@@ -21,76 +21,120 @@ APPNAME="gitea"
 APPBINARY="gitea"
 APPSIG="7C9E68152594688862D62AF62D9AE806EC1592E2"
 APPASC="${APPNAME}-${APPVERSION}-${OS}-${ARCH}.asc"
-KEYSERV="pgp.mit.edu"
+KEYSERV="hkp://p80.pool.sks-keyservers.net:80"
 DLSERV="dl.gitea.io"
 APPDIR="${WKDIR}/gitea"
 APPBINDIR="${APPDIR}/bin"
 APPCONFDIR="/etc/${APPNAME}"
 
-if [[ -d ${APPCONFDIR} ]]
+function configure_proxy {
-then
+   proxy=$(CreoleGet activer_proxy_client non)
-   exit 0
+   if [[ ${proxy} == "oui" ]]
-fi
+   then
+      prAddr=$(CreoleGet proxy_client_adresse)
+      prPort=$(CreoleGet proxy_client_port)
+      export HTTP_PROXY=http://${prAddr}:${prPort}
+      export http_proxy=http://${prAddr}:${prPort}
+      export HTTPS_PROXY=http://${prAddr}:${prPort}
+      export https_proxy=http://${prAddr}:${prPort}
+   fi
+}
 
-proxy=$(CreoleGet activer_proxy_client non)
+function create_app_dir {
+   
+   if [[ ! -d ${APPDIR} ]] 
+   then
+      mkdir -p ${APPDIR}
+      chown ${USER}:${GROUP} ${APPDIR} -R
+   fi
 
-if [[ ${proxy} == "oui" ]]
+   # Create app structure
-then
+   mkdir -p ${APPDIR}/{custom,data,indexers,public,log}
-   prAddr=$(CreoleGet proxy_client_adresse)
+   chown ${USER}:${GROUP} ${APPDIR}/{data,indexers,log}
-   prPort=$(CreoleGet proxy_client_port)
+   chmod 750 ${APPDIR}/{data,indexers,log}
-   export HTTP_PROXY=http://${prAddr}:${prPort}
+   mkdir -p ${APPCONFDIR}
-   export http_proxy=http://${prAddr}:${prPort}
+   chown root:${GROUP} ${APPCONFDIR}
-   export HTTPS_PROXY=http://${prAddr}:${prPort}
+   chmod 770 ${APPCONFDIR}
-   export https_proxy=http://${prAddr}:${prPort}
-fi
 
-if [[ ! -d ${APPDIR} ]] 
+   if [[ ! -d ${APPBINDIR} ]]
-then
+   then
-   mkdir -p ${APPDIR}
+      mkdir -p ${APPBINDIR}
-   chown ${USER}:${GROUP} ${APPDIR} -R
+      chown ${USER}:${GROUP} ${APPBINDIR}
-fi
+   fi
+}
 
-# Create app user and group
+function create_user_and_group {
-groupadd ${GROUP}
+   local existing_group=$(getent group ${GROUP})
-adduser \
+   if [ -z "${existing_group}" ]; then
-   --shell ${USERSHELL} \
+      groupadd ${GROUP}
-   --gecos "${GECOS}" \
+   fi
-   --ingroup ${GROUP} \
-   --disabled-password \
-   --home ${HOMEDIR} \
-   ${USER}
 
-# Create app structure
+   local existing_user=$(getent passwd ${USER})
-mkdir -p ${APPDIR}/{custom,data,indexers,public,log}
+   if [ -z "${existing_user}" ]; then
-chown ${USER}:${GROUP} ${APPDIR}/{data,indexers,log}
+      adduser \
-chmod 750 ${APPDIR}/{data,indexers,log}
+         --shell ${USERSHELL} \
-mkdir ${APPCONFDIR}
+         --gecos "${GECOS}" \
-chown root:${GROUP} ${APPCONFDIR}
+         --ingroup ${GROUP} \
-chmod 770 ${APPCONFDIR}
+         --disabled-password \
+         --home ${HOMEDIR} \
+         ${USER}
+   fi
+}
 
-if [[ ! -d ${APPBINDIR} ]]
+function download_binary {
-then
+   local temp_bin=$(mktemp)
-   mkdir -p ${APPBINDIR}
-   chown ${USER}:${GROUP} ${APPBINDIR}
-fi
 
-cd $APPBINDIR
+   wget -O "${temp_bin}" https://${DLSERV}/${APPNAME}/${APPVERSION}/${APPNAME}-${APPVERSION}-${OS}-${ARCH}
-if [[ ! -f ${APPBINARY} ]]
+   if [[ $? -ne  0 ]]
-then
+   then
-  wget -O ${APPBINARY} https://${DLSERV}/${APPNAME}/${APPVERSION}/${APPNAME}-${APPVERSION}-${OS}-${ARCH}
+      echo "Error downloading binary for ${APPNAME}"
-  if [[ $? -eq  0 ]]
+      return 123
-  then
+   fi
-     chmod +x ${APPBINARY}
-  else
-     echo "Error downloading binary for ${APPNAME}"
-     return 123
-  fi
-fi
 
-if [[ ! -f ${APPASC} ]] 
+   wget -O "${temp_bin}.asc" https://${DLSERV}/${APPNAME}/${APPVERSION}/${APPASC}
-then
-   wget -O ${APPASC} https://${DLSERV}/${APPNAME}/${APPVERSION}/${APPASC}
    gpg --keyserver ${KEYSERV} --recv ${APPSIG}
-   gpg --verify ${APPNAME}-${APPVERSION}-${OS}-${ARCH}.asc ${APPBINARY}
+   gpg --verify "${temp_bin}.asc" "${temp_bin}"
-fi
+
-cd -
+   if [[ $? -ne  0 ]]
+   then
+      echo "Error downloading binary for ${APPNAME}"
+      return 123
+   fi
+
+   cd $APPBINDIR
+   chmod +x "${temp_bin}"
+   mv -f "${temp_bin}" ${APPBINARY}
+   cd -
+}
+
+function current_gitea_version {
+   if [[ ! -f "${APPBINDIR}/${APPBINARY}" ]]
+   then
+      return
+   fi
+   "${APPBINDIR}/${APPBINARY}" --version | cut -d' ' -f 3
+}
+
+function main {
+   
+   # Check that installed version if ok
+   local current_version=$(current_gitea_version)
+   if [ "$current_version" == "$APPVERSION" ]; then
+      exit 0
+   fi
+   
+   if [ -z "$current_version" ]
+   then
+      echo "Installing Gitea ${APPVERSION}..."
+   else
+      echo "Upgrade Gitea from ${current_version} to ${APPVERSION}..."
+   fi
+   
+   configure_proxy
+   create_user_and_group
+   create_app_dir
+   download_binary
+   
+}
+
+main