root/ubuntu-post-install
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #189 from outis1one/claude/asterisk-digital-ocean-w22kk8

Browse Source 
Claude/asterisk digital ocean w22kk8
This commit is contained in:
Outis
2026-07-20 14:58:28 -04:00
committed by GitHub
parent 2f06eb7f5d d9af3ecc3f
commit 33c9586667
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/wolf-pair.sh
+17 -7
View File
@@ -422,13 +422,11 @@ COMPOSE
chown -R "$ACTUAL_USER:$ACTUAL_USER" "$WOLFPAIR_DIR" chown -R "$ACTUAL_USER:$ACTUAL_USER" "$WOLFPAIR_DIR"
# ── 4. Firewall ─────────────────────────────────────────────────────────── # ── 4. Caddy (optional) ───────────────────────────────────────────────────
if command -v ufw &>/dev/null; then # Decided before the firewall rule below: wolf-pair has no login of its
ufw allow "${WOLFPAIR_PORT}/tcp" comment "wolf-pair pairing UI" >/dev/null 2>&1 || true # own (that's the whole reason to offer Authelia here), so if Caddy ends
log_success "UFW: opened port $WOLFPAIR_PORT/tcp" # up fronting it locally, the UFW rule must not also leave the bare port
fi # open to the internet — that would bypass Authelia entirely.
# ── 5. Caddy (optional) ───────────────────────────────────────────────────
local WOLFPAIR_EXTRA_BLOCK="" local WOLFPAIR_EXTRA_BLOCK=""
if [ -d "$DOCKER_DIR/authelia" ]; then if [ -d "$DOCKER_DIR/authelia" ]; then
local _use_auth="" local _use_auth=""
@@ -437,6 +435,18 @@ COMPOSE
fi fi
configure_caddy_for_service "wolf-pair" "$WOLFPAIR_PORT" "wolf-pair" "$WOLFPAIR_EXTRA_BLOCK" configure_caddy_for_service "wolf-pair" "$WOLFPAIR_PORT" "wolf-pair" "$WOLFPAIR_EXTRA_BLOCK"
# ── 5. Firewall ───────────────────────────────────────────────────────────
if command -v ufw &>/dev/null; then
if [[ "$CADDY_SERVICE_CONFIGURED" == true && "$CADDY_SERVICE_MODE" == "local" ]]; then
ufw delete allow "${WOLFPAIR_PORT}/tcp" 2>/dev/null || true
ufw_allow_from_caddy_net "${WOLFPAIR_PORT}"
else
ufw allow "${WOLFPAIR_PORT}/tcp" comment "wolf-pair pairing UI" >/dev/null 2>&1 || true
log_success "UFW: opened port $WOLFPAIR_PORT/tcp"
fi
ensure_ufw_enabled
fi
# ── 6. README ───────────────────────────────────────────────────────────── # ── 6. README ─────────────────────────────────────────────────────────────
write_readme "$WOLFPAIR_DIR" << 'MD' write_readme "$WOLFPAIR_DIR" << 'MD'
# wolf-pair # wolf-pair
vendor/easy-asterisk/easy-asterisk-v0.10.0.sh
Vendored
+11 -11
View File
@@ -549,7 +549,7 @@ manage_categories() {
# Delete the category # Delete the category
sed -i "/^${cid}|/d" "$CATEGORIES_FILE" sed -i "/^${cid}|/d" "$CATEGORIES_FILE"
asterisk -rx "pjsip reload" 2>/dev/null asterisk -rx "module reload res_pjsip.so" 2>/dev/null
rebuild_dialplan rebuild_dialplan
print_success "Category and ${device_count} device(s) deleted" print_success "Category and ${device_count} device(s) deleted"
else else
@@ -867,7 +867,7 @@ qualify_frequency=30
EOF EOF
chown -R asterisk:asterisk /etc/asterisk 2>/dev/null || true chown -R asterisk:asterisk /etc/asterisk 2>/dev/null || true
asterisk -rx "pjsip reload" >/dev/null 2>&1 asterisk -rx "module reload res_pjsip.so" >/dev/null 2>&1
rebuild_dialplan rebuild_dialplan
# Prepare provisioning URLs if HTTP server is configured # Prepare provisioning URLs if HTTP server is configured
@@ -1019,7 +1019,7 @@ remove_device() {
' /etc/asterisk/pjsip.conf > /etc/asterisk/pjsip.conf.tmp ' /etc/asterisk/pjsip.conf > /etc/asterisk/pjsip.conf.tmp
mv /etc/asterisk/pjsip.conf.tmp /etc/asterisk/pjsip.conf mv /etc/asterisk/pjsip.conf.tmp /etc/asterisk/pjsip.conf
chown asterisk:asterisk /etc/asterisk/pjsip.conf chown asterisk:asterisk /etc/asterisk/pjsip.conf
asterisk -rx "pjsip reload" 2>/dev/null asterisk -rx "module reload res_pjsip.so" 2>/dev/null
rebuild_dialplan rebuild_dialplan
print_success "All devices deleted" print_success "All devices deleted"
else else
@@ -1066,7 +1066,7 @@ remove_device() {
' /etc/asterisk/pjsip.conf > /etc/asterisk/pjsip.conf.tmp ' /etc/asterisk/pjsip.conf > /etc/asterisk/pjsip.conf.tmp
mv /etc/asterisk/pjsip.conf.tmp /etc/asterisk/pjsip.conf mv /etc/asterisk/pjsip.conf.tmp /etc/asterisk/pjsip.conf
chown asterisk:asterisk /etc/asterisk/pjsip.conf chown asterisk:asterisk /etc/asterisk/pjsip.conf
asterisk -rx "pjsip reload" 2>/dev/null asterisk -rx "module reload res_pjsip.so" 2>/dev/null
rebuild_dialplan rebuild_dialplan
print_success "Removed extension $ext ($name)" print_success "Removed extension $ext ($name)"
fi fi
@@ -1155,7 +1155,7 @@ rename_device() {
chown asterisk:asterisk /etc/asterisk/pjsip.conf chown asterisk:asterisk /etc/asterisk/pjsip.conf
# Reload Asterisk # Reload Asterisk
asterisk -rx "pjsip reload" 2>/dev/null asterisk -rx "module reload res_pjsip.so" 2>/dev/null
rebuild_dialplan quiet rebuild_dialplan quiet
print_success "Device renamed: ${old_name} → ${new_name}" print_success "Device renamed: ${old_name} → ${new_name}"
@@ -3943,7 +3943,7 @@ uninstall_menu() {
awk '/^; === Device:/{exit} {print}' /etc/asterisk/pjsip.conf > "$temp" awk '/^; === Device:/{exit} {print}' /etc/asterisk/pjsip.conf > "$temp"
mv "$temp" /etc/asterisk/pjsip.conf mv "$temp" /etc/asterisk/pjsip.conf
chown asterisk:asterisk /etc/asterisk/pjsip.conf chown asterisk:asterisk /etc/asterisk/pjsip.conf
asterisk -rx "pjsip reload" >/dev/null 2>&1 || true asterisk -rx "module reload res_pjsip.so" >/dev/null 2>&1 || true
fi fi
print_success "All devices removed" print_success "All devices removed"
;; ;;
@@ -4339,7 +4339,7 @@ def delete_device(extension):
if found: if found:
with open(PJSIP_CONF, 'w') as f: with open(PJSIP_CONF, 'w') as f:
f.writelines(new_lines) f.writelines(new_lines)
subprocess.run(['asterisk', '-rx', 'pjsip reload'], capture_output=True) subprocess.run(['asterisk', '-rx', 'module reload res_pjsip.so'], capture_output=True)
subprocess.run(['/usr/local/bin/easy-asterisk', '--rebuild-dialplan'], capture_output=True) subprocess.run(['/usr/local/bin/easy-asterisk', '--rebuild-dialplan'], capture_output=True)
return True, "Device deleted" return True, "Device deleted"
return False, "Device not found" return False, "Device not found"
@@ -4413,7 +4413,7 @@ def rename_device(extension, new_name):
if found: if found:
with open(PJSIP_CONF, 'w') as f: with open(PJSIP_CONF, 'w') as f:
f.writelines(new_lines) f.writelines(new_lines)
subprocess.run(['asterisk', '-rx', 'pjsip reload'], capture_output=True) subprocess.run(['asterisk', '-rx', 'module reload res_pjsip.so'], capture_output=True)
subprocess.run(['/usr/local/bin/easy-asterisk', '--rebuild-dialplan'], capture_output=True) subprocess.run(['/usr/local/bin/easy-asterisk', '--rebuild-dialplan'], capture_output=True)
return True, "Device renamed" return True, "Device renamed"
return False, "Device not found" return False, "Device not found"
@@ -4526,7 +4526,7 @@ def change_device_category(extension, new_category):
if found: if found:
with open(PJSIP_CONF, 'w') as f: with open(PJSIP_CONF, 'w') as f:
f.writelines(new_lines) f.writelines(new_lines)
subprocess.run(['asterisk', '-rx', 'pjsip reload'], capture_output=True) subprocess.run(['asterisk', '-rx', 'module reload res_pjsip.so'], capture_output=True)
subprocess.run(['/usr/local/bin/easy-asterisk', '--rebuild-dialplan'], capture_output=True) subprocess.run(['/usr/local/bin/easy-asterisk', '--rebuild-dialplan'], capture_output=True)
return True, "Category changed" return True, "Category changed"
return False, "Device not found" return False, "Device not found"
@@ -4775,7 +4775,7 @@ qualify_frequency=30
with open(PJSIP_CONF, 'a') as f: with open(PJSIP_CONF, 'a') as f:
f.write(device_config) f.write(device_config)
subprocess.run(['asterisk', '-rx', 'pjsip reload'], capture_output=True) subprocess.run(['asterisk', '-rx', 'module reload res_pjsip.so'], capture_output=True)
subprocess.run(['chown', 'asterisk:asterisk', PJSIP_CONF], capture_output=True) subprocess.run(['chown', 'asterisk:asterisk', PJSIP_CONF], capture_output=True)
subprocess.run(['/usr/local/bin/easy-asterisk', '--rebuild-dialplan'], capture_output=True) subprocess.run(['/usr/local/bin/easy-asterisk', '--rebuild-dialplan'], capture_output=True)
@@ -6891,7 +6891,7 @@ import_clients() {
# Reload Asterisk # Reload Asterisk
echo "" echo ""
echo "Reloading Asterisk configuration..." echo "Reloading Asterisk configuration..."
asterisk -rx "pjsip reload" >/dev/null 2>&1 asterisk -rx "module reload res_pjsip.so" >/dev/null 2>&1
rebuild_dialplan quiet rebuild_dialplan quiet
print_success "Import completed successfully!" print_success "Import completed successfully!"