Commit 65c64ba2 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Merge branch 'amiranda/137-reorganize-etc-and-share-folder' into 'main' 

Resolve "Reorganize `/etc` and `/share` folder"

Closes #137

See merge request !106
parents ac475418 811ff669

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ gcc-debug: 
      - compiled/bin/

      - compiled/etc/

      - compiled/lib/

      - compiled/share/

      - build/examples/

      - build/tests/

      - build/src/scord/scord

etc/CMakeLists.txt

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
# SPDX-License-Identifier: GPL-3.0-or-later                                    #

################################################################################



add_subdirectory(deploy_scripts)



configure_file(scord.conf.in scord.conf)

configure_file(scord-ctl.conf.in scord-ctl.conf @ONLY)

etc/scord-ctl.conf.in

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ config: 
        environment:

          VAR0: value0

          VAR1: value1

        # The command that scord-ctl will use to start an adhoc instance of

        # The command that `scord-ctl` will use to start an adhoc instance of

        # this type. The following variables are supported that will be

        # automatically replaced by scord-ctl if found between curly braces:

        #  * ADHOC_NODES: A comma separated list of valid job hostnames that
@@ -24,7 +24,7 @@ config: 
        #    `working_directory` and automatically removed after the adhoc

        #    instance has been shut down.

        #  * ADHOC_ID: - A unique ID for the adhoc instance.

        command: @CMAKE_INSTALL_FULL_SYSCONFDIR@/@PROJECT_NAME@/gekkofs.sh

        command: @CMAKE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/adhoc_services.d/gekkofs.sh

                    start

                    --hosts {ADHOC_NODES}

                    --workdir {ADHOC_DIRECTORY}
@@ -32,7 +32,7 @@ config: 
                    --mountdir {ADHOC_DIRECTORY}/mnt

      shutdown:

        environment:

        command: @CMAKE_INSTALL_FULL_SYSCONFDIR@/@PROJECT_NAME@/gekkofs.sh

        command: @CMAKE_INSTALL_FULL_DATADIR@/@PROJECT_NAME@/adhoc_services.d/gekkofs.sh

                    stop

                    --workdir {ADHOC_DIRECTORY}

plugins/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -22,4 +22,5 @@ 
# SPDX-License-Identifier: GPL-3.0-or-later                                    #

################################################################################



add_subdirectory(adhoc_services.d)

add_subdirectory(slurm)

etc/deploy_scripts/CMakeLists.txt→plugins/adhoc_services.d/CMakeLists.txt

+5 −2
Original line number Diff line number Diff line
@@ -24,10 +24,13 @@ 


list(APPEND ADHOC_SCRIPTS "${CMAKE_CURRENT_SOURCE_DIR}/gekkofs.sh")



# install adhoc scripts to `<sysconfdir>/scord` (normally /etc/scord)

# install adhoc scripts to `<datadir>/scord/adhoc_services.d/`

# (normally /usr/share/scord/adhoc_services.d/)

get_filename_component(INSTALL_DESTINATION ${CMAKE_CURRENT_SOURCE_DIR} NAME)



install(

  FILES ${ADHOC_SCRIPTS}

  DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/${PROJECT_NAME}

  DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}/${INSTALL_DESTINATION}

  PERMISSIONS

    OWNER_EXECUTE OWNER_WRITE OWNER_READ

    GROUP_EXECUTE GROUP_READ