We have two versions of SIPconfig.xml: etc/SIPconfig.xml debian/templates/SIPconfig.xml The former has been updated with some changes to the possible configuration of SIP2 servers, e.g. by bug 15006. The latter has not been updated with the same information. Since debian/templates/SIPconfig.xml contains no special placeholders or variables, this bug proposes to simply copy etc/SIPconfig.xml to debian/templates/SIPconfig.xml, so that admins using the packages will see an up-to-date SIP2 config example when they have enabled SIP2 for a site.
Created attachment 55051 [details] [review] Bug 17228 - Make two versions of SIPconfig.xml identical Several bugs have made changes to etc/SIPconfig.xml but not updated debian/templates/SIPconfig.xml. This means that an admin using the Debian packages who enables SIP2 for a site and looks at /etc/koha/sites/<instance>/SIPconfig.xml will not see an up-to-date version of that file, with the risk of missing possible config opportunities. Since debian/templates/SIPconfig.xml contains no placeholders or other magic stuff related to the Debian packaging, this patch simply copies etc/SIPconfig.xml to debian/templates/SIPconfig.xml To test: $ diff etc/SIPconfig.xml debian/templates/SIPconfig.xml There should be no difference between the files
Created attachment 55052 [details] [review] Bug 17228 - Make two versions of SIPconfig.xml identical Several bugs have made changes to etc/SIPconfig.xml but not updated debian/templates/SIPconfig.xml. This means that an admin using the Debian packages who enables SIP2 for a site and looks at /etc/koha/sites/<instance>/SIPconfig.xml will not see an up-to-date version of that file, with the risk of missing possible config opportunities. Since debian/templates/SIPconfig.xml contains no placeholders or other magic stuff related to the Debian packaging, this patch simply copies etc/SIPconfig.xml to debian/templates/SIPconfig.xml To test: $ diff etc/SIPconfig.xml debian/templates/SIPconfig.xml There should be no difference between the files
Created attachment 55053 [details] [review] Bug 17228 - Fix whitespace in etc/SIPconfig.xml Remove trailing whitespace and replace tabs with 4 spaces.
Created attachment 55054 [details] [review] Bug 17228 - Make two versions of SIPconfig.xml identical Several bugs have made changes to etc/SIPconfig.xml but not updated debian/templates/SIPconfig.xml. This means that an admin using the Debian packages who enables SIP2 for a site and looks at /etc/koha/sites/<instance>/SIPconfig.xml will not see an up-to-date version of that file, with the risk of missing possible config opportunities. Since debian/templates/SIPconfig.xml contains no placeholders or other magic stuff related to the Debian packaging, this patch simply copies etc/SIPconfig.xml to debian/templates/SIPconfig.xml To test: $ diff etc/SIPconfig.xml debian/templates/SIPconfig.xml There should be no difference between the files
Created attachment 55090 [details] [review] Bug 17228 - Make two versions of SIPconfig.xml identical Several bugs have made changes to etc/SIPconfig.xml but not updated debian/templates/SIPconfig.xml. This means that an admin using the Debian packages who enables SIP2 for a site and looks at /etc/koha/sites/<instance>/SIPconfig.xml will not see an up-to-date version of that file, with the risk of missing possible config opportunities. Since debian/templates/SIPconfig.xml contains no placeholders or other magic stuff related to the Debian packaging, this patch simply copies etc/SIPconfig.xml to debian/templates/SIPconfig.xml To test: $ diff etc/SIPconfig.xml debian/templates/SIPconfig.xml There should be no difference between the files Signed-off-by: Claire Gravely <claire_gravely@hotmail.com>
Created attachment 55106 [details] [review] Bug 17228 - Fix whitespace in etc/SIPconfig.xml Remove trailing whitespace and replace tabs with 4 spaces. Signed-off-by: Claire Gravely <claire_gravely@hotmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Created attachment 55107 [details] [review] Bug 17228 - Make two versions of SIPconfig.xml identical Several bugs have made changes to etc/SIPconfig.xml but not updated debian/templates/SIPconfig.xml. This means that an admin using the Debian packages who enables SIP2 for a site and looks at /etc/koha/sites/<instance>/SIPconfig.xml will not see an up-to-date version of that file, with the risk of missing possible config opportunities. Since debian/templates/SIPconfig.xml contains no placeholders or other magic stuff related to the Debian packaging, this patch simply copies etc/SIPconfig.xml to debian/templates/SIPconfig.xml To test: diff etc/SIPconfig.xml debian/templates/SIPconfig.xml There should be no difference between the files Signed-off-by: Claire Gravely <claire_gravely@hotmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Pushed to master for 16.11, thanks Magnus!
Pushed in 16.05. Will be in 16.05.04.
Pushed to 3.22.x, will be in 3.22.11
Created attachment 157677 [details] [review] Bug 17228 - Make two versions of SIPconfig.xml identical Several bugs have made changes to etc/SIPconfig.xml but not updated debian/templates/SIPconfig.xml. This means that an admin using the Debian packages who enables SIP2 for a site and looks at /etc/koha/sites/<instance>/SIPconfig.xml will not see an up-to-date version of that file, with the risk of missing possible config opportunities. Since debian/templates/SIPconfig.xml contains no placeholders or other magic stuff related to the Debian packaging, this patch simply copies etc/SIPconfig.xml to debian/templates/SIPconfig.xml To test: diff etc/SIPconfig.xml debian/templates/SIPconfig.xml There should be no difference between the files Signed-off-by: Claire Gravely <claire_gravely@hotmail.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> (cherry picked from commit d0d8bd18225483c3c28ba9e0bd368301c6835a66) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Please ignore, I messed up and attached to this bug by mistake.