Overview
Comment: | Update debian default config so that the package can be installed and used with a web server, eg. apache |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | dev |
Files: | files | file ages | folders |
SHA1: |
f9d3fe02dcb8656fe8698f7160891e50 |
User & Date: | bohwaz on 2020-11-10 18:45:22 |
Other Links: | branch diff | manifest | tags |
Context
2020-11-10
| ||
18:50 | random_bytes is now included in PHP 7+ check-in: 6fefbf6432 user: bohwaz tags: dev | |
18:45 | Update debian default config so that the package can be installed and used with a web server, eg. apache check-in: f9d3fe02dc user: bohwaz tags: dev | |
04:49 | Improve label truncate in pie graph check-in: 06a302654e user: bohwaz tags: dev | |
Changes
Modified debian/config.debian.php from [2bf60e0d52] to [1cd45bbd87].
︙ | ︙ | |||
43 44 45 46 47 48 49 | } if (!file_exists($_ENV['XDG_CACHE_HOME'] . '/garradin')) { mkdir($_ENV['XDG_CACHE_HOME'] . '/garradin', 0700, true); } | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 | } if (!file_exists($_ENV['XDG_CACHE_HOME'] . '/garradin')) { mkdir($_ENV['XDG_CACHE_HOME'] . '/garradin', 0700, true); } if (!defined('Garradin\CACHE_ROOT')) { define('Garradin\CACHE_ROOT', $_ENV['XDG_CACHE_HOME'] . '/garradin'); } if (!defined('Garradin\DB_FILE')) { $last_file = $_ENV['XDG_CONFIG_HOME'] . '/garradin/last'; if ($_ENV['GARRADIN_STANDALONE'] != 1) |
︙ | ︙ | |||
71 72 73 74 75 76 77 78 | define('Garradin\DB_FILE', $last_sqlite); } if (!defined('Garradin\LOCAL_LOGIN')) { define('Garradin\LOCAL_LOGIN', true); } } | > > > > > > > > > > > > > > > > > > > > > > > | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | define('Garradin\DB_FILE', $last_sqlite); } if (!defined('Garradin\LOCAL_LOGIN')) { define('Garradin\LOCAL_LOGIN', true); } } elseif (isset($_SERVER['SERVER_NAME'])) { if (file_exists('/etc/garradin/config.php')) { require_once '/etc/garradin/config.php'; } if (!defined('Garradin\DATA_ROOT')) { define('Garradin\DATA_ROOT', '/var/lib/garradin'); } if (!defined('Garradin\CACHE_ROOT')) { define('Garradin\CACHE_ROOT', '/var/cache/garradin'); } } if (!defined('Garradin\SECRET_KEY')) { if (file_exists(CACHE_ROOT . '/key')) { define('Garradin\SECRET_KEY', trim(file_get_contents(CACHE_ROOT . '/key'))); } else { define('Garradin\SECRET_KEY', base64_encode(random_bytes(64))); file_put_contents(CACHE_ROOT . '/key', SECRET_KEY); } } |
Modified debian/makedeb.sh from [8ea97a3f94] to [00b4e03f70].
︙ | ︙ | |||
36 37 38 39 40 41 42 43 44 45 46 47 48 49 | CODEDIR=${DEBLOCALPREFIX}/share/${PACKAGE_DEBNAME} mkdir -p ${CODEDIR} cp -r ${SRCDIR}/* ${CODEDIR} cp ${THISDIR}/config.debian.php ${CODEDIR}/config.local.php rm -rf ${CODEDIR}/*.sqlite ${CODEDIR}/cache ${CODEDIR}/www/squelettes cp ${THISDIR}/garradin.png "${CODEDIR}" # Cleaning files that will be copied to /usr/share/doc #rm -f ${CODEDIR}/../{README.md,COPYING} cd $DEBROOT || { echo "Debian dest dir [$DEBROOT] not found. :(" exit 2 | > > > > | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | CODEDIR=${DEBLOCALPREFIX}/share/${PACKAGE_DEBNAME} mkdir -p ${CODEDIR} cp -r ${SRCDIR}/* ${CODEDIR} cp ${THISDIR}/config.debian.php ${CODEDIR}/config.local.php rm -rf ${CODEDIR}/*.sqlite ${CODEDIR}/cache ${CODEDIR}/www/squelettes cp ${THISDIR}/garradin.png "${CODEDIR}" mkdir -p "${DEBROOT}/var/lib/${PACKAGE_DEBNAME}" mkdir -p "${DEBROOT}/var/cache/${PACKAGE_DEBNAME}" mkdir -p "${DEBROOT}/etc/${PACKAGE_DEBNAME}" # Cleaning files that will be copied to /usr/share/doc #rm -f ${CODEDIR}/../{README.md,COPYING} cd $DEBROOT || { echo "Debian dest dir [$DEBROOT] not found. :(" exit 2 |
︙ | ︙ | |||
64 65 66 67 68 69 70 71 72 73 74 75 76 77 | true && { echo "Generating Debian-specific files..." cp ${THISDIR}/../COPYING ${DEBLOCALPREFIX}/share/doc/${PACKAGE_DEBNAME}/copyright } || { echo "Fail." exit 1 } true && { CHANGELOG=${DEBLOCALPREFIX}/share/doc/${PACKAGE_DEBNAME}/changelog.gz cat <<EOF | gzip -c > ${CHANGELOG} ${PACKAGE_DEBNAME} ${PACKAGE_DEB_VERSION}; urgency=low | > > > > > > > > > > > > > > | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | true && { echo "Generating Debian-specific files..." cp ${THISDIR}/../COPYING ${DEBLOCALPREFIX}/share/doc/${PACKAGE_DEBNAME}/copyright } || { echo "Fail." exit 1 } true && { cat <<EOF > DEBIAN/postinst #!/bin/sh chown www-data:www-data /var/lib/garradin /var/cache/garradin chown root:www-data /etc/garradin chmod g=rX,o= /etc/garradin chmod ug=rwX,o= /var/lib/garradin /var/cache/garradin EOF chmod +x DEBIAN/postinst } true && { CHANGELOG=${DEBLOCALPREFIX}/share/doc/${PACKAGE_DEBNAME}/changelog.gz cat <<EOF | gzip -c > ${CHANGELOG} ${PACKAGE_DEBNAME} ${PACKAGE_DEB_VERSION}; urgency=low |
︙ | ︙ | |||
105 106 107 108 109 110 111 | echo "Generating ${CONTROL}..." cat <<EOF > ${CONTROL} Package: ${PACKAGE_DEBNAME} Section: web Priority: optional Maintainer: Garradin <garradin@kd2.org> Architecture: ${DEB_ARCH_NAME} | | | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | echo "Generating ${CONTROL}..." cat <<EOF > ${CONTROL} Package: ${PACKAGE_DEBNAME} Section: web Priority: optional Maintainer: Garradin <garradin@kd2.org> Architecture: ${DEB_ARCH_NAME} Depends: dash | bash, php-cli (>=7.2), php-sqlite3 Version: ${PACKAGE_DEB_VERSION} Suggests: www-browser, php-gd Homepage: http://dev.kd2.org/garradin/ Description: Garradin is a tool to manage non-profit organizations. It's only available in french. Description-fr: Gestionnaire d'association en interface web ou CLI. Garradin est un gestionnaire d'association à but non lucratif. |
︙ | ︙ |