diff options
| author | Todd Zullinger <tmz@pobox.com> | 2021-06-07 01:33:34 -0400 |
|---|---|---|
| committer | Todd Zullinger <tmz@pobox.com> | 2022-01-01 23:45:33 -0500 |
| commit | b726ae307f3f3d44177994e29851459064751646 (patch) | |
| tree | a1d77c4bcb5410cf91e25305f4d57dbc40362016 | |
| parent | 6b6d374a41f442484c4bd6a4156719d631c5b17d (diff) | |
| download | cgit_EL6-b726ae307f3f3d44177994e29851459064751646.tar.gz | |
improve httpd config file creation
Remove the needless %dist conditional, all supported Fedora and EPEL
releases use httpd-2.4.
Use macros consistently within the httpd.conf file.
Set the timestamp of the httpd.conf to match the README from the
tarball to keep it consistent across builds.
| -rw-r--r-- | cgit.spec | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -163,15 +163,14 @@ grep -rl '#!.*/env' filters/ | xargs -r sed -Ei 's@^(.+/)env (.+)$@\1\2@' find contrib -type f | xargs -r chmod -x # default httpd config -cat > httpd.conf <<EOF -Alias /cgit-data /usr/share/cgit -ScriptAlias /cgit /var/www/cgi-bin/cgit -%if 0%{?fedora} || 0%{?rhel} >= 7 -<Directory "/usr/share/cgit"> +cat >httpd.conf <<EOF +Alias /%{name}-data %{cgitdata} +ScriptAlias /%{name} %{scriptdir}/%{name} +<Directory "%{cgitdata}"> Require all granted </Directory> -%endif EOF +touch -r README httpd.conf %build @@ -216,6 +215,7 @@ make test * Mon Jul 26 2021 Todd Zullinger <tmz@pobox.com> - 1.2.3-7 - update SELinux README - simplify install commands +- improve httpd config file creation * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild |