EQMacEmu (Quarm) Separation, Setup & Requirements #33
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chazix
commented
Nov 3, 2023
•
chazix
commented
- to-do: migrate my github specific links to official quarm links
…, -DCURL_INCLUDE_DIR for EQMacEmu req
…t; init-server-binaries to --compile-server
…sting (update, update-source, m); alias reconfiguration to point to correct -DCURL_LIBRARY -DCURL_INCLUDE_DIR (cm)
…-DCURL_LIBRARY, -DCURL_INCLUDE_DIR
…elative path for -DCURL_LIBRARY, -DCURL_INCLUDE_DIR
…s (libcurl4-openssl-dev), to prevent having to build the entire image with requirements; removing -DCURL_LIBRARY, -DCURL_INCLUDE_DIR
…sing in REMOTE_IP_ADDRESS where needed
…uild (since we're not re-creating the image)
… don't want to update to peq binaries
…il this is sorted)" This reverts commit e853990.
…l-additional-depends, build, build-clean
…pital 'Old.opcodes'
…atabase values aren't getting input
…atabase values aren't getting input
…atabase values aren't getting input
…atabase values aren't getting input
…rver.qsdatabase values aren't getting input
chazix
commented
Nov 3, 2023
assets/scripts/Makefile
Outdated
Comment on lines
94
to
124
| init-eqemu-config-peq: ##@init eqemu config for PEQ | ||
| @cat ~/server/eqemu_config.json \ | ||
| | jq '.server.database.password = "${EQEMU_DB_PASSWORD}"' \ | ||
| | jq '.server.world.key = "$(shell cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w $${1:-32} | head -n 1)"' \ | ||
| | jq '.server.zones.ports.high = "${PORT_RANGE_HIGH}"' \ | ||
| | jq '.server.world.address = "${IP_ADDRESS}"' \ | ||
| | tee ~/server/eqemu_config.json | ||
|
|
||
| init-eqemu-config-quarm: ##@init eqemu config for Quarm | ||
| @cat ~/server/eqemu_config.json \ | ||
| | jq '.server.qsdatabase.host = "$(shell ~/assets/scripts/init/get-config-var.sh '.server.database.host')"' \ | ||
| | jq '.server.qsdatabase.db = "$(shell ~/assets/scripts/init/get-config-var.sh '.server.database.db')"' \ | ||
| | jq '.server.qsdatabase.username = "$(shell ~/assets/scripts/init/get-config-var.sh '.server.database.username')"' \ | ||
| | jq '.server.qsdatabase.password = "$(shell ~/assets/scripts/init/get-config-var.sh '.server.database.password')"' \ | ||
| | jq '.server.database.password = "${EQEMU_DB_PASSWORD}"' \ | ||
| | jq '.server.world.key = "$(shell cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w $${1:-32} | head -n 1)"' \ | ||
| | jq '.server.world.loginserver1.host = "${IP_ADDRESS}"' \ | ||
| | jq '.server.zones.ports.high = "${PORT_RANGE_HIGH}"' \ | ||
| | jq '.server.world.address = "${REMOTE_IP_ADDRESS}"' \ | ||
| | jq '.server.world.localaddress = "${IP_ADDRESS}"' \ | ||
| | jq '.server.chatserver.host = "${IP_ADDRESS}"' \ | ||
| | tee ~/server/eqemu_config.json | ||
|
|
||
| init-eqemu-config: ##@init Bootstraps eqemu config | ||
| @./assets/scripts/banner.pl "Initializing EQEmu Config" | ||
| @make pull-docker-config | ||
| @cat ~/server/eqemu_config.json \ | ||
| | jq '.server.database.password = "${EQEMU_DB_PASSWORD}"' \ | ||
| | jq '.server.world.key = "$(shell cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w $${1:-32} | head -n 1)"' \ | ||
| | jq '.server.zones.ports.high = "${PORT_RANGE_HIGH}"' \ | ||
| | jq '.server.world.address = "${IP_ADDRESS}"' \ | ||
| | tee ~/server/eqemu_config.json | ||
| ifeq ("$(PLATFORM_TARGET)", "peq") | ||
| @make init-eqemu-config-peq | ||
| else ifeq ("$(PLATFORM_TARGET)", "quarm") | ||
| @make init-eqemu-config-quarm | ||
| endif |
There was a problem hiding this comment.
I'm encountering some sort of race condition issue here. Where some of the variables, particularly .server.qsdatabase.password is not getting written to the eqemu_config.json
I verified all the environment variables are as expected. If I run make init-eqemu-config-quarm manually, it emplaces correctly.
If you can take a look that would be great, or a suggestion. Issue appears to be:
- running
make init-eqemu-configreproduces - commands executing in parallel
- pulling config occurs before or after the jq commands
- jq commands not executing in order
…exported when we source .env
…exported when we source .env
…B_HOST, EQEMU_DB_DATABASE, EQEMU_DB_USER
…ress wasn't specified
…IP_ADDRESS (this will use IP_ADDRESS if no remote specified); potential fix for .server.qsdatabase.{host|db|username|password} data setting race condition
…address wasn't specified
…is doesn't work as I was expecting
…t's default use IN_IP_ADDRESS
…nfig-admin-{peq|quarm}
…fig.json on my end
…stent eqemu_config.json on my end; need to restore .server.directories.maps after spire:occulus-update
…counter situations where it doesn't pull even tho it appears it is
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.