diff --git a/nix/mariadb-up-mac.nix b/nix/mariadb-up-mac.nix index f38da539d..d513a4807 100644 --- a/nix/mariadb-up-mac.nix +++ b/nix/mariadb-up-mac.nix @@ -1,122 +1,126 @@ { lib , gnused , openssl , mariadb , writeShellApplication , writeTextFile }: let # Use small script executed by bash to have a normal shell environment. mariadb-entrypoint = writeShellApplication { name = "mariadb-init"; text = '' MARIADB_DIR=''${XDG_DATA_HOME:-$HOME/.local/share}/MariaDB - # 'exec' allows for us to replace bash process with MariaDB echo "View MariaDB logs: tail -f $MARIADB_DIR/logs" >&2 echo "Kill MariaDB server: pkill mariadbd" >&2 + # Explicitly close fd3 to prevent `direnv` from hanging + # (https://linear.app/comm/issue/ENG-3254/remove-wait-logic-in-nix-develop) + exec 3>&- + + # 'exec' allows for us to replace bash process with MariaDB exec "${mariadb}/bin/mariadbd" \ --socket "$MARIADB_DIR"/mysql.sock \ --datadir "$MARIADB_DIR" \ &> "$MARIADB_DIR"/logs ''; }; mariadb-version = let versions = lib.versions; in "${versions.major mariadb.version}.${versions.minor mariadb.version}"; # Small boiler-plate text file for us to write for keyserver db_config_template = writeTextFile { name = "db-config"; text = '' { "host": "localhost", "user": "comm", "password": "PASS", "database": "comm", "dbType": "mariadb${mariadb-version}" } ''; }; # writeShellApplication is a "writer helper" which # will create a shellchecked executable shell script located in $out/bin/ # This shell script will be used to allow for impure+stateful actions in writeShellApplication { name = "mariadb-up"; text = '' # "$HOME/Library/Application Support/" is the canonical path to use # on darwin for storing user data for installed applications. # However, mysql and mariadb don't quote paths in the mariadbd script, # so use XDG conventions and hope $HOME doesn't have a space. MARIADB_DATA_HOME="''${XDG_DATA_HOME:-$HOME/.local/share}/MariaDB" MARIADB_PIDFILE="$MARIADB_DATA_HOME"/mariadb.pid export MYSQL_UNIX_PORT="$MARIADB_DATA_HOME"/mysql.sock if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then # mysql directory should exist if MariaDB has been initialized echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 "${lib.getBin mariadb}/bin/mariadb-install-db" \ --datadir="$MARIADB_DATA_HOME" \ --auth-root-authentication-method=socket fi "${../scripts/start_comm_daemon.sh}" \ mariadbd \ MariaDB \ "${mariadb-entrypoint}/bin/mariadb-init" \ "$MARIADB_PIDFILE" if [[ ! -S "$MYSQL_UNIX_PORT" ]]; then echo "Waiting for MariaDB to come up" while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done fi # Assume this was run from git repository PRJ_ROOT=$(git rev-parse --show-toplevel) KEYSERVER_DB_CONFIG="$PRJ_ROOT"/keyserver/secrets/db_config.json # Check if database exists commDBCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ -Bse "SELECT COUNT(1) FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = 'comm';" ) if [[ "$commDBCount" -eq 0 ]]; then "${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ -Bse "CREATE DATABASE comm" fi # Initialize comm user, database, and secrets file for MariaDB # Connecting through socket doesn't require a password userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" ) if [[ "$userCount" -eq 0 ]]; then echo "Creating comm user" >&2 "${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ -Bse "CREATE USER comm@localhost; GRANT ALL ON "'comm.*'" TO comm@localhost;" fi if [[ ! -f "$KEYSERVER_DB_CONFIG" ]]; then echo "Writing connection information to $KEYSERVER_DB_CONFIG" >&2 mkdir -p "$(dirname "$KEYSERVER_DB_CONFIG")" PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) "${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ -Bse "ALTER USER comm@localhost IDENTIFIED BY '$PASS'" # It's very difficult to write json from bash, just copy a nix # file then use sed to subsitute cp "${db_config_template}" "$KEYSERVER_DB_CONFIG" chmod +w "$KEYSERVER_DB_CONFIG" # Nix files are read-only "${gnused}/bin/sed" -i -e "s|PASS|$PASS|g" "$KEYSERVER_DB_CONFIG" fi # Explicitly exit this script so the parent shell can determine # when it's safe to return control of terminal to user exit 0 ''; } diff --git a/nix/redis-up-mac.nix b/nix/redis-up-mac.nix index 6afdd6cde..b0a571482 100644 --- a/nix/redis-up-mac.nix +++ b/nix/redis-up-mac.nix @@ -1,45 +1,49 @@ { lib , redis , writeShellApplication , writeTextFile }: let # Use small script executed by bash to have a normal shell environment. redis-entrypoint = writeShellApplication { name = "redis-init"; text = '' REDIS_CACHE_DIR=''${XDG_CACHE_HOME:-$HOME/Library/Caches}/Redis mkdir -p "$REDIS_CACHE_DIR" echo "View Redis Logs: tail -f $REDIS_CACHE_DIR/logs" >&2 echo "Kill Redis server: pkill redis" >&2 - # 'exec' allows for us to replace bash process with MariaDB + # Explicitly close fd3 to prevent `direnv` from hanging + # (https://linear.app/comm/issue/ENG-3254/remove-wait-logic-in-nix-develop) + exec 3>&- + + # 'exec' allows for us to replace bash process with Redis exec ${redis}/bin/redis-server \ &> "$REDIS_CACHE_DIR"/logs ''; }; # will create a shellchecked executable shell script located in $out/bin/ # This shell script will be used to allow for impure+stateful actions in writeShellApplication { name = "redis-up"; text = '' # so use XDG conventions and hope $HOME doesn't have a space. REDIS_CACHE_DIR=''${XDG_CACHE_HOME:-$HOME/Library/Caches}/Redis REDIS_PIDFILE="$REDIS_CACHE_DIR"/redis.pid mkdir -p "$REDIS_CACHE_DIR" "${../scripts/start_comm_daemon.sh}" \ redis \ Redis \ "${redis-entrypoint}/bin/redis-init" \ "$REDIS_PIDFILE" # Explicitly exit this script so the parent shell can determine # when it's safe to return control of terminal to user exit 0 ''; }