xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-09-04 12:07:56 +00:00
Code Issues Releases Wiki Activity

build(httpd): centralize Apache configuration sources

Browse Source
This commit is contained in:
Vinícius Ferrão
2026-08-30 18:14:23 -03:00
parent a5ad2f7b26
commit 5b5fa69791
7 changed files with 125 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-utils/sync-xcat-apache-configs
Executable
+113
View File
@@ -0,0 +1,113 @@
#!/bin/sh
set -eu
usage()
{
printf 'Usage: %s --check|--write|--stage DIRECTORY\n' "${0##*/}" >&2
}
case ${1-}:$# in
--check:1|--write:1)
mode=$1
;;
--stage:2)
mode=$1
stage_directory=$2
;;
*)
usage
exit 2
;;
esac
script_dir=$(CDPATH='' cd "$(dirname "$0")" && pwd -P)
repo_root=$(CDPATH='' cd "$script_dir/.." && pwd -P)
status=0
temp_file=
trap 'if [ -n "$temp_file" ]; then rm -f "$temp_file"; fi' 0
trap 'exit 1' 1 2 3 15
has_expected_mode()
{
mode_path=$1
mode_match=$(find "$mode_path" -prune -type f -perm 0644 -print 2>/dev/null)
[ "$mode_match" = "$mode_path" ]
}
replace_target()
{
replace_source=$1
replace_target=$2
if [ -d "$replace_target" ]; then
printf '%s cannot replace a directory\n' "$replace_target" >&2
return 1
fi
temp_file=$(mktemp "$replace_target.tmp.XXXXXX")
cp "$replace_source" "$temp_file"
chmod 0644 "$temp_file"
mv -f "$temp_file" "$replace_target"
temp_file=
}
validate_source()
{
source_relative=$1
source_path=$repo_root/$source_relative
if [ ! -f "$source_path" ] || [ -L "$source_path" ]; then
printf '%s must be a regular file\n' "$source_relative" >&2
status=1
fi
}
sync_pair()
{
source_relative=$1
target_relative=$2
source_path=$repo_root/$source_relative
target_path=$repo_root/$target_relative
content_matches=0
if [ -f "$target_path" ] && [ ! -L "$target_path" ] && \
cmp "$source_path" "$target_path" >/dev/null 2>&1; then
content_matches=1
if has_expected_mode "$target_path"; then
return
fi
fi
if [ "$mode" = "--check" ]; then
printf '%s is out of date; run %s --write\n' \
"$target_relative" "${0##*/}" >&2
status=1
return
fi
replace_target "$source_path" "$target_path"
if [ "$content_matches" -eq 0 ]; then
printf 'updated %s\n' "$target_relative"
fi
}
validate_source xCAT/xcat.conf
validate_source xCAT/xcat.conf.apach24
if [ "$status" -ne 0 ]; then
exit "$status"
fi
if [ "$mode" = "--stage" ]; then
if [ ! -d "$stage_directory" ]; then
printf '%s is not a directory\n' "$stage_directory" >&2
exit 1
fi
replace_target "$repo_root/xCAT/xcat.conf" "$stage_directory/xcat.conf"
replace_target "$repo_root/xCAT/xcat.conf.apach24" \
"$stage_directory/xcat.conf.apach24"
else
sync_pair xCAT/xcat.conf xCATsn/xcat.conf
sync_pair xCAT/xcat.conf.apach24 xCATsn/xcat.conf.apach24
fi
exit "$status"
buildrpms.pl
+3 -3
View File
@@ -443,10 +443,10 @@ EOF
tar --sort=name --owner=0 --group=0 --mtime="\@$SOURCE_DATE_EPOCH" -czf "$SOURCES/$pkg-$VERSION.tar.gz" $pkg
tar --sort=name --owner=0 --group=0 --mtime="\@$SOURCE_DATE_EPOCH" -czf "$SOURCES/license.tar.gz" -C $pkg LICENSE.html
tar --sort=name --owner=0 --group=0 --mtime="\@$SOURCE_DATE_EPOCH" -czf "$SOURCES/etc.tar.gz" -C xCAT etc
cp $pkg/xcat.conf $SOURCES
cp $pkg/xcat.conf.apach24 $SOURCES
cp $pkg/xCATSN $SOURCES
EOF
system('build-utils/sync-xcat-apache-configs', '--stage', $SOURCES) == 0
or die "FATAL: unable to stage canonical Apache configurations\n";
cp "$pkg/xCATSN", $SOURCES;
# xCATsn.spec consumes templates from xCAT shared templates payload.
sh qq(tar --sort=name --owner=0 --group=0 --mtime="\@$SOURCE_DATE_EPOCH" -czf "$SOURCES/templates.tar.gz" xCAT/templates) unless -f "$SOURCES/templates.tar.gz";
} elsif ($pkg eq "xCAT-probe") {
makerpm
+5 -2
View File
@@ -141,8 +141,11 @@ function makexcat {
elif [ "$RPMNAME" = "xCATsn" ]; then
cd `dirname $0`/$RPMNAME
tar --exclude .svn -czf $RPMROOT/SOURCES/license.tar.gz LICENSE.html
cp xcat.conf $RPMROOT/SOURCES
cp xcat.conf.apach24 $RPMROOT/SOURCES
../build-utils/sync-xcat-apache-configs --stage "$RPMROOT/SOURCES" || {
RC=$?
cd - >/dev/null
return $RC
}
cp xCATSN $RPMROOT/SOURCES
cp -a ../xCAT/etc/rsyslog.d $RPMROOT/
cp -a ../xCAT/etc/logrotate.d $RPMROOT/
xCAT/xcat.conf
+1 -1
View File
@@ -2,7 +2,7 @@
# This configuration file allows a diskfull install to access the install images
# via http. It also allows the xCAT documentation to be accessed via
# http://localhost/xcat-doc/
# Updates to xCAT/xcat.conf should also be made to xCATsn/xcat.conf
# Service-node copies are generated from the matching configuration under xCAT/.
#
ServerTokens Prod
xCAT/xcat.conf.apach24
+1 -1
View File
@@ -2,7 +2,7 @@
# This configuration file allows a diskfull install to access the install images
# via http. It also allows the xCAT documentation to be accessed via
# http://localhost/xcat-doc/
# Updates to xCAT/xcat.conf should also be made to xCATsn/xcat.conf
# Service-node copies are generated from the matching configuration under xCAT/.
#
ServerTokens Prod
xCATsn/xcat.conf
+1 -1
View File
@@ -2,7 +2,7 @@
# This configuration file allows a diskfull install to access the install images
# via http. It also allows the xCAT documentation to be accessed via
# http://localhost/xcat-doc/
# Updates to xCAT/xcat.conf should also be made to xCATsn/xcat.conf
# Service-node copies are generated from the matching configuration under xCAT/.
#
ServerTokens Prod
xCATsn/xcat.conf.apach24
+1 -2
View File
@@ -2,7 +2,7 @@
# This configuration file allows a diskfull install to access the install images
# via http. It also allows the xCAT documentation to be accessed via
# http://localhost/xcat-doc/
# Updates to xCAT/xcat.conf should also be made to xCATsn/xcat.conf
# Service-node copies are generated from the matching configuration under xCAT/.
#
ServerTokens Prod
@@ -48,4 +48,3 @@ Alias /xcat-doc "/opt/xcat/share/doc"
AllowOverride None
Require all granted
</Directory>