| Server IP : 82.208.35.60 / Your IP : 216.73.216.238 Web Server : Apache/2.4.55 (FreeBSD) OpenSSL/1.1.1q-freebsd PHP/7.3.31 System : FreeBSD server7.d2m.cz 12.4-RELEASE-p9 FreeBSD 12.4-RELEASE-p9 GENERIC amd64 User : studiokobylisy_cz ( 1008) PHP Version : 7.3.31 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : OFF | Perl : OFF | Python : OFF | Sudo : OFF | Pkexec : OFF Directory : /usr/ports/sysutils/bareos20-server/files/ |
Upload File : |
--- core/cmake/BareosInstallConfigFiles.cmake 2020-12-16 02:46:16.000000000 -0500
+++ core/cmake/BareosInstallConfigFiles.cmake 2020-12-23 22:41:21.832081000 -0500
@@ -55,20 +55,12 @@
get_filename_component(resname ${resdir} NAME)
foreach(configfile ${configfiles})
get_filename_component(fname ${configfile} NAME)
- if(EXISTS ${DESTCONFDIR}/${resname}/${fname})
- message(STATUS "${DESTCONFDIR}/${resname}/${fname} exists")
- message(STATUS "rename ${configfile} to ${configfile}.new")
- file(RENAME "${configfile}" "${configfile}.new")
-
- message(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}")
- file(COPY "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}")
- file(RENAME "${configfile}.new" "${configfile}")
- else()
- message(
- STATUS "${resname}/${fname} as ${resname}/${fname} (new installation)"
- )
- file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
- endif()
+ message(STATUS "${resname}/${fname} as ${resname}/${fname}.sample (new installation)")
+ file(RENAME "${configfile}" "${configfile}.sample")
+ file(
+ COPY "${configfile}.sample"
+ DESTINATION "${DESTCONFDIR}/${resname}"
+ )
endforeach()
endforeach()
@@ -104,23 +96,12 @@
get_filename_component(dir ${configfile} DIRECTORY)
get_filename_component(fname ${configfile} NAME)
- if(EXISTS ${DESTCONFDIR}/${configfile})
- message(STATUS "${configfile} as ${configfile}.new (keep existing)")
- file(RENAME "${BackendConfigSrcDir}/${configfile}"
- "${BackendConfigSrcDir}/${configfile}.new"
- )
- file(COPY "${BackendConfigSrcDir}/${configfile}.new"
- DESTINATION "${DESTCONFDIR}/${dir}"
- )
- file(RENAME "${BackendConfigSrcDir}/${configfile}.new"
- "${BackendConfigSrcDir}/${configfile}"
- )
- else()
- message(STATUS "${configfile} as ${configfile}")
- file(COPY "${BackendConfigSrcDir}/${configfile}"
- DESTINATION "${DESTCONFDIR}/${dir}"
- )
- endif()
+ message(STATUS "${configfile} as ${configfile}")
+ file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample")
+ file(
+ COPY "${BackendConfigSrcDir}/${configfile}.sample"
+ DESTINATION "${DESTCONFDIR}/${dir}"
+ )
endforeach()
file(
@@ -130,7 +111,8 @@
)
foreach(configfile ${configfiles})
get_filename_component(dir ${configfile} DIRECTORY)
- # get_filename_component(fname ${configfile} NAME)
+ get_filename_component(fname ${configfile} NAME)
+ get_filename_component(fsname ${configfile} NAME_WE)
if(EXISTS ${DESTCONFDIR}/${configfile})
message(STATUS "overwriting ${configfile}")
@@ -138,9 +120,11 @@
message(STATUS "${configfile} as ${configfile}")
endif()
- file(COPY "${BackendConfigSrcDir}/${configfile}"
- DESTINATION "${DESTCONFDIR}/${dir}"
- )
+ file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${fsname}.conf.sample")
+ file(
+ COPY "${BackendConfigSrcDir}/${fsname}.conf.sample"
+ DESTINATION "${DESTCONFDIR}/${dir}"
+ )
endforeach()
endforeach()
@@ -167,20 +151,13 @@
string(REGEX MATCH "\\.in\$" IS_INFILE ${configfile})
if(NOT "${IS_INFILE}" STREQUAL ".in")
get_filename_component(fname ${configfile} NAME)
- if(EXISTS ${DESTCONFDIR}/${resname}/${fname})
- message(
- STATUS
- "${resname}/${fname} as ${resname}/${fname}.new (keep existing)"
- )
- file(RENAME "${configfile}" "${configfile}.new")
- file(COPY "${configfile}.new"
- DESTINATION "${DESTCONFDIR}/${resname}"
- )
- file(RENAME "${configfile}.new" "${configfile}")
- else()
- message(STATUS "${resname}/${fname} as ${resname}/${fname}")
- file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
- endif()
+ get_filename_component(fsname ${configfile} NAME_WE)
+ message(STATUS "${resname}/${fname} as ${resname}/${fname}")
+ file(RENAME "${configfile}" "${resdir}/${fsname}.conf.sample")
+ file(
+ COPY "${resdir}/${fsname}.conf.sample"
+ DESTINATION "${DESTCONFDIR}/${resname}"
+ )
else()
message(STATUS "skipping .in file ${configfile}:${IS_INFILE}")
endif()