[cpp-sp] branch main updated: Remove more files, add dummy IIS config.
Scott Cantor
cantor.2 at osu.edu
Wed Jul 23 23:03:57 UTC 2025
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=0a3bd34093f5a78008bf6b79510219d1c8d5e358
The following commit(s) were added to refs/heads/main by this push:
new 0a3bd340 Remove more files, add dummy IIS config.
0a3bd340 is described below
commit 0a3bd34093f5a78008bf6b79510219d1c8d5e358
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jul 23 19:03:48 2025 -0400
Remove more files, add dummy IIS config.
---
configs/Makefile.am | 8 ++----
configs/iis-config.ini | 5 ++++
configs/seckeygen.bat | 78 --------------------------------------------------
configs/seckeygen.sh | 56 ------------------------------------
4 files changed, 7 insertions(+), 140 deletions(-)
diff --git a/configs/Makefile.am b/configs/Makefile.am
index 19a4ea7b..79c3d91e 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -6,8 +6,7 @@ pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@
pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
pkgsysconf_DATA = \
- apache24.config \
- seckeygen.sh
+ apache24.config
# While BUILTCONFIGFILES are processed, these are not; so we should pull
# them from SRCDIR.
@@ -59,13 +58,10 @@ install-data-local: all-data-local
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${pkgsysconfdir}/$$f.dist; \
done
-install-data-hook:
- chmod +x $(DESTDIR)$(pkgsysconfdir)/seckeygen.sh
-
CLEANFILES = \
apache24.config
EXTRA_DIST = \
apache24.config.in \
- seckeygen.bat \
+ iis-config.ini \
$(CONFIGFILES)
diff --git a/configs/iis-config.ini b/configs/iis-config.ini
new file mode 100644
index 00000000..c3d84437
--- /dev/null
+++ b/configs/iis-config.ini
@@ -0,0 +1,5 @@
+[1]
+name = site1.example.org
+
+[2]
+name = site2.example.org
diff --git a/configs/seckeygen.bat b/configs/seckeygen.bat
deleted file mode 100644
index 016b187a..00000000
--- a/configs/seckeygen.bat
+++ /dev/null
@@ -1,78 +0,0 @@
- at echo off
-setlocal ENABLEDELAYEDEXPANSION
-
-set /A HISTORY=14
-set /A BYTES=16
-set FILENAME=sealer.keys
-set OUT=%~dp0
-
-:opt_start
-set PARAM=%1
-
-if not defined PARAM goto opt_end
-if %1==-o goto opt_out
-if %1==-h goto opt_history
-if %1==-b goto opt_bits
-if %1==-f goto opt_filename
-goto usage
-:opt_end
-
-set PATH=%PATH%;%ProgramFiles%\Shibboleth\SP\lib\
-if exist %OUT%\%FILENAME%.tmp del /Q %OUT%\%FILENAME%.tmp
-
-set /A LINECOUNT=0
-if exist %OUT%\%FILENAME% goto getlinecount
-
-:compute
-set /A CHOP=LINECOUNT + 1
-if %CHOP% LEQ %HISTORY% (set /A CHOP=0) else (set /A CHOP=CHOP - HISTORY)
-echo Removing %CHOP% old key(s)...
-
-if exist %OUT%\%FILENAME% (goto :regurgitate) else (set /A KEYVER=1)
-
-:addkey
-for /F %%a in ('openssl.exe rand -base64 %BYTES%') do set KEYVAL=%%a
-echo %KEYVER%:%KEYVAL% >> %OUT%\%FILENAME%.tmp
-move /Y %OUT%\%FILENAME%.tmp %OUT%\%FILENAME%
-echo Added key version: %KEYVER%
-exit /b
-
-:getlinecount
-for /F %%a in ('type %OUT%\%FILENAME% ^| find /V /C ""') do set LINECOUNT=%%a
-goto compute
-
-:regurgitate
-for /F "delims=: tokens=1,2" %%i in (%OUT%\%FILENAME%) do (
- if !CHOP! GTR 0 (set /A CHOP=!CHOP! - 1) else (echo %%i:%%j >> %OUT%\%FILENAME%.tmp)
- set KEYVER=%%i
-)
-set /A KEYVER=KEYVER + 1
-goto addkey
-
-:opt_out
-set OUT=%2
-shift
-shift
-goto opt_start
-
-:opt_filename
-set FILENAME=%2
-shift
-shift
-goto opt_start
-
-:opt_history
-set /A HISTORY=%2
-shift
-shift
-goto opt_start
-
-:opt_bits
-set /A BYTES=%2 / 8
-shift
-shift
-goto opt_start
-
-:usage
-echo usage: seckeygen [-h key history to maintain] [-b key bits] [-f filename] [-o output dir]
-exit /b
diff --git a/configs/seckeygen.sh b/configs/seckeygen.sh
deleted file mode 100755
index cb8df4db..00000000
--- a/configs/seckeygen.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-
-while getopts h:u:g:o:f:b: c
- do
- case $c in
- u) USER=$OPTARG;;
- g) GROUP=$OPTARG;;
- o) OUT=$OPTARG;;
- b) BITS=$OPTARG;;
- f) FILENAME=$OPTARG;;
- h) HISTORY=$OPTARG;;
- \?) echo "seckeygen [-o output directory (default .)] [-f filename (default sealer.keys)] [-h key history (default 14)] [-b key size in bits (default 128)] [-u owning username] [-g owning groupname]"
- exit 1;;
- esac
- done
-
-if [ -z "$OUT" ] ; then
- OUT=.
-fi
-
-if [ -z "$FILENAME" ]; then
- FILENAME="sealer.keys"
-fi
-
-if [ -z "$HISTORY" ] ; then
- HISTORY=14
-fi
-
-if [ -z "$BITS" ] ; then
- BITS=128
-fi
-
-BYTES=`expr $BITS / 8`
-
-rm -f $OUT/${FILENAME}.tmp
-touch $OUT/${FILENAME}.tmp
-chmod 600 $OUT/${FILENAME}.tmp
-
-KEYVER=1
-if [ -f $OUT/${FILENAME} -a $HISTORY -gt 0 ] ; then
- tail -n `expr $HISTORY - 1` $OUT/${FILENAME} > $OUT/${FILENAME}.tmp
- KEYVER=`tail -n 1 $OUT/${FILENAME}.tmp | awk -F: '{print $1}'`
- KEYVER=`expr $KEYVER + 1`
-fi
-KEYVAL=`openssl rand -base64 $BYTES 2> /dev/null`
-echo "${KEYVER}:${KEYVAL}" >> $OUT/${FILENAME}.tmp
-
-mv $OUT/${FILENAME}.tmp $OUT/${FILENAME}
-
-if [ -s $OUT/${FILENAME} -a -n "$USER" ] ; then
- chown $USER $OUT/${FILENAME}
-fi
-
-if [ -s $OUT/${FILENAME} -a -n "$GROUP" ] ; then
- chgrp $GROUP $OUT/${FILENAME}
-fi
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list