V10.424 stabilize 111 proxy launch agent install
Some checks failed
CD Pipeline / deploy (push) Has been cancelled

This commit is contained in:
OoO
2026-05-24 15:41:05 +08:00
committed by AiderHeal Bot
parent 1487f7fb10
commit 868d75f972
4 changed files with 13 additions and 6 deletions

View File

@@ -11,6 +11,8 @@ PLIST_DIR="${HOME}/Library/LaunchAgents"
PLIST_PATH="${PLIST_DIR}/${LABEL}.plist"
LOG_DIR="${HOME}/Library/Logs"
PID_FILE="${HOME}/.ollama/ollama111-allow-proxy.pid"
INSTALL_DIR="${OLLAMA111_PROXY_INSTALL_DIR:-${HOME}/.local/share/momo-pro-system}"
INSTALL_SCRIPT_PATH="${INSTALL_DIR}/ollama111_allow_proxy.py"
PYTHON_BIN="${PYTHON_BIN:-/usr/bin/python3}"
OLLAMA_APP="${OLLAMA_APP:-/Applications/Ollama.app}"
OLLAMA_HOST_VALUE="${OLLAMA_HOST_VALUE:-127.0.0.1:11434}"
@@ -22,7 +24,9 @@ if [[ ! -f "${PROJECT_DIR}/scripts/ops/ollama111_allow_proxy.py" ]]; then
exit 1
fi
mkdir -p "${PLIST_DIR}" "${LOG_DIR}" "${HOME}/.ollama"
mkdir -p "${PLIST_DIR}" "${LOG_DIR}" "${HOME}/.ollama" "${INSTALL_DIR}"
cp "${PROJECT_DIR}/scripts/ops/ollama111_allow_proxy.py" "${INSTALL_SCRIPT_PATH}"
chmod 0755 "${INSTALL_SCRIPT_PATH}"
launchctl setenv OLLAMA_HOST "${OLLAMA_HOST_VALUE}"
@@ -65,10 +69,10 @@ cat > "${PLIST_PATH}" <<PLIST
<key>ProgramArguments</key>
<array>
<string>${PYTHON_BIN}</string>
<string>${PROJECT_DIR}/scripts/ops/ollama111_allow_proxy.py</string>
<string>${INSTALL_SCRIPT_PATH}</string>
</array>
<key>WorkingDirectory</key>
<string>${PROJECT_DIR}</string>
<string>${INSTALL_DIR}</string>
<key>EnvironmentVariables</key>
<dict>
<key>OLLAMA111_PROXY_ALLOWED_CIDRS</key>
@@ -97,12 +101,14 @@ cat > "${PLIST_PATH}" <<PLIST
PLIST
launchctl bootout "${GUI_DOMAIN}" "${PLIST_PATH}" >/dev/null 2>&1 || true
: > "${LOG_DIR}/ollama111-allow-proxy.err.log"
launchctl bootstrap "${GUI_DOMAIN}" "${PLIST_PATH}"
launchctl kickstart -k "${GUI_DOMAIN}/${LABEL}"
sleep 2
echo "installed ${LABEL}"
echo "plist=${PLIST_PATH}"
echo "script=${INSTALL_SCRIPT_PATH}"
echo "allowed=${ALLOWED_CIDRS}"
launchctl print "${GUI_DOMAIN}/${LABEL}" | head -40 || true
tail -20 "${LOG_DIR}/ollama111-allow-proxy.log" || true