Skip to content

feat: Introduction of DDE_DATA_HOME and Path Adjustments#65

Open
sbaerlocher wants to merge 1 commit intowhatwedo:masterfrom
sbaerlocher:feature/move-data-home
Open

feat: Introduction of DDE_DATA_HOME and Path Adjustments#65
sbaerlocher wants to merge 1 commit intowhatwedo:masterfrom
sbaerlocher:feature/move-data-home

Conversation

@sbaerlocher
Copy link
Contributor

@sbaerlocher sbaerlocher commented Jan 26, 2024

Added

  • New Script createDataHome.sh:

    • Introduced a new _createDataHome function for creating the DDE_DATA_HOME directory and migrating data from DATA_DIR.
    • Setup of configuration files in the DDE_DATA_HOME.
  • Transition from DATA_DIR to DDE_DATA_HOME in checkUpdate.sh:

    • Adjusted the script to use DDE_DATA_HOME directory instead of DATA_DIR for update checks.
    • No functional changes to script behavior.

Modified

  • Updates in destroy.sh and up.sh:

    • Changed from CERT_DIR to DDE_CERT_PATH for handling SSL certificates.
    • Adjusted path variables without changing the functionality.
  • Environment Variable Updates in system Directory (install.sh, env.sh, up.sh):

    • Included DDE_DATA_HOME and DDE_CERT_PATH environment variables, marking DATA_DIR and CERT_DIR as deprecated.
    • Integrated _createDataHome into both install.sh and update.sh.

Removed

  • Empty File data/.gitkeep:
    • Deleted the empty placeholder file, as it's no longer needed.

Refactored

  • dde.sh and docker-compose.yml Adjustments:
    • Implemented new environment variables DDE_DATA_HOME and DDE_CERT_PATH.
    • Updated volume paths in docker-compose.yml to align with new directory structures.

Related Issue

@s4mpl3d s4mpl3d self-requested a review February 16, 2024 10:21
@sbaerlocher sbaerlocher requested a review from ArnoEgli February 22, 2024 16:22
@sbaerlocher sbaerlocher force-pushed the feature/move-data-home branch from 182d225 to bbfcd9f Compare February 29, 2024 10:26
@robinlehrmann
Copy link
Contributor

Hello @sbaerlocher I think you need to check the nuke command in this file as well. :)

echo ROOT_DIR=${ROOT_DIR}
echo DATA_DIR=${DATA_DIR}
echo CERT_DIR=${CERT_DIR}
_logYellow "DATA_DIR (Deprecated, use DDE_DATA_HOME) = ${DATA_DIR}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sbaerlocher since its not a user-setting, we can fully remove data_dir from the code and just copy the ./data directory as boilerplate to the new path. This would also allow us to ship some default configuration

fi

# Create dde.conf in the nginx conf.d directory if it doesn't exist
local nginxConfFile="$DDE_DATA_HOME/data/reverseproxy/etc/nginx/conf.d/dde.conf"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not needed, if we treat the data directory in this repo as "defaults"

fi

# Create config.yml if it doesn't exist
local configFile="$DDE_DATA_HOME/config.yml"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where / why is this file needed? i dont see it referenced anywhere

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments