fix: 🐛 volume permissions and error messages

This commit is contained in:
Juan Angel
2022-12-28 14:33:22 +01:00
committed by juanAngel
parent 8326c8a0a4
commit d955a7c653
4 changed files with 16 additions and 20 deletions

View File

@@ -1,7 +1,6 @@
FROM node:18-alpine3.16 as build
WORKDIR /build
RUN apk add --no-cache --update git
COPY ["package.json", "package-lock.json", "./"]
@@ -28,7 +27,6 @@ ENV DB_PASSWORD=nostr-ts-relay
WORKDIR /app
RUN apk add --no-cache --update git
RUN mkdir /home/node/tor && chown node:node /home/node/tor && chmod 777 /home/node/tor
COPY --from=build /build/dist .

View File

@@ -21,11 +21,12 @@ services:
TOR_PASSWORD: nostr_ts_relay
HIDDEN_SERVICE_PORT: 80
# Enable DEBUG for troubleshooting. Examples:
# DEBUG: "primary:*"
# DEBUG: "worker:*"
# DEBUG: "knex:query"
user: node:node
volumes:
- ${PWD}/.nostr:/home/node/
- relay_data:/home/node/
ports:
- 8008:8008
depends_on:
@@ -125,5 +126,6 @@ networks:
- subnet: 10.10.10.0/24
volumes:
relay_data:
cache:
pgdata:

View File

@@ -63,9 +63,9 @@ export class App implements IRunnable {
debug('settings: %O', this.settingsFactory())
const host = `${hostname()}:${port}}`
const host = `${hostname()}:${port}`
addOnion(torHiddenServicePort, host).then(value=>{
logCentered(`tor hidden service address: ${value}:${torHiddenServicePort}`, width)
console.info(`tor hidden service address: ${value}:${torHiddenServicePort}`)
}, (error) => {
console.error('Unable to add Tor hidden service. Skipping.', error)
})

View File

@@ -60,24 +60,20 @@ export const addOnion = async (
debug('error reading private key: %o', error)
}
try {
const client = await getTorClient()
if (!client) {
return
}
if (client) {
const hiddenService = await client.addOnion(port, host, privateKey)
debug('hidden service: %s:%d', hiddenService.ServiceID, port)
const client = await getTorClient()
if (client) {
const hiddenService = await client.addOnion(port, host, privateKey)
debug('hidden service: %s:%d', hiddenService.ServiceID, port)
if (hiddenService?.PrivateKey) {
debug('saving private key to %s', path)
await writeFile(path, hiddenService.PrivateKey, 'utf8')
}
if (hiddenService?.PrivateKey) {
debug('saving private key to %s', path)
await writeFile(path, hiddenService.PrivateKey, 'utf8')
return hiddenService.ServiceID
}else{
throw new Error(JSON.stringify(hiddenService))
}
} catch (error) {
console.error('error adding onion: %o', error)
}else{
throw new Error('not connect')
}
}