lee/caprover
1
0
Fork 0
mirror of https://github.com/caprover/caprover synced 2025-10-30 10:07:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed formatter

Browse Source
This commit is contained in:
Kasra Bigdeli
2024-12-29 22:23:46 -08:00
parent a30591ec4a
commit 8c208a1a4e
7 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app.ts
View File

@@ -113,8 +113,11 @@ app.use(CaptainConstants.netDataRelativePath, function (req, res, next) {
const newUrl =
(isRequestSsl ? 'https://' : 'http://') +
req.hostname + ':' +
(isRequestSsl ? CaptainConstants.configs.nginxPortNumber443 : CaptainConstants.configs.nginxPortNumber80) +
req.hostname +
':' +
(isRequestSsl
? CaptainConstants.configs.nginxPortNumber443
: CaptainConstants.configs.nginxPortNumber80) +
CaptainConstants.netDataRelativePath +
'/'
res.redirect(302, newUrl)

12
src/datastore/DataStore.ts
View File

@@ -4,8 +4,8 @@
import Configstore = require('configstore')
import fs = require('fs-extra')
import {
AutomatedCleanupConfigsCleaner,
IAutomatedCleanupConfigs,
AutomatedCleanupConfigsCleaner,
IAutomatedCleanupConfigs,
} from '../models/AutomatedCleanupConfigs'
import CapRoverTheme from '../models/CapRoverTheme'
import { GoAccessInfo } from '../models/GoAccessInfo'
@@ -249,10 +249,10 @@ class DataStore {
const goAccessInfo = (self.data.get(GOACCESS_INFO) ||
{}) as GoAccessInfo
goAccessInfo.isEnabled = goAccessInfo.isEnabled || false
if(!goAccessInfo.data) {
goAccessInfo.data = {
rotationFrequencyCron:'0 0 1 * *' // monthly
}
if (!goAccessInfo.data) {
goAccessInfo.data = {
rotationFrequencyCron: '0 0 1 * *', // monthly
}
}
return Promise.resolve(goAccessInfo)
}

1
src/server.ts
View File

@@ -47,7 +47,6 @@ function startServer() {
server.on('error', onError)
server.on('listening', onListening)
/**
* Event listener for HTTP server "error" event.
*/

2
src/user/system/LoadBalancerManager.ts
View File

@@ -794,7 +794,7 @@ class LoadBalancerManager {
0
)
} else {
Logger.d('Captain Nginx is NOT running.. ')
Logger.d('Captain Nginx is NOT running.. ')
return createNginxServiceOnNode(myNodeId).then(function () {
return myNodeId
})

8
src/utils/CaptainConstants.ts
View File

@@ -205,7 +205,13 @@ const data = {
// ********************* ETC ************************
disableFirewallCommand:
'ufw allow ' + configs.nginxPortNumber80 + ',' + configs.nginxPortNumber443 + ',' + configs.adminPortNumber3000 + ',996,7946,4789,2377/tcp; ufw allow 7946,4789,2377/udp; ',
'ufw allow ' +
configs.nginxPortNumber80 +
',' +
configs.nginxPortNumber443 +
',' +
configs.adminPortNumber3000 +
',996,7946,4789,2377/tcp; ufw allow 7946,4789,2377/udp; ',
gitShaEnvVarKey: 'CAPROVER_GIT_COMMIT_SHA',
}

27
src/utils/CaptainInstaller.ts
View File

@@ -280,13 +280,22 @@ export function install() {
return startServerOnPort_80_443_3000()
})
.then(function () {
return checkPortOrThrow(myIp4, CaptainConstants.configs.nginxPortNumber80 as any)
return checkPortOrThrow(
myIp4,
CaptainConstants.configs.nginxPortNumber80 as any
)
})
.then(function () {
return checkPortOrThrow(myIp4, CaptainConstants.configs.nginxPortNumber443 as any)
return checkPortOrThrow(
myIp4,
CaptainConstants.configs.nginxPortNumber443 as any
)
})
.then(function () {
return checkPortOrThrow(myIp4, CaptainConstants.configs.adminPortNumber3000 as any)
return checkPortOrThrow(
myIp4,
CaptainConstants.configs.adminPortNumber3000 as any
)
})
.then(function () {
const imageName = CaptainConstants.configs.nginxImageName
@@ -333,16 +342,16 @@ export function install() {
value: '1',
})
env.push({
key: EnvVar.keys.CAPTAIN_HOST_ADMIN_PORT,
value: CaptainConstants.configs.adminPortNumber3000 + '',
key: EnvVar.keys.CAPTAIN_HOST_ADMIN_PORT,
value: CaptainConstants.configs.adminPortNumber3000 + '',
})
env.push({
key: EnvVar.keys.CAPTAIN_HOST_HTTP_PORT,
value: CaptainConstants.configs.nginxPortNumber80 + '',
key: EnvVar.keys.CAPTAIN_HOST_HTTP_PORT,
value: CaptainConstants.configs.nginxPortNumber80 + '',
})
env.push({
key: EnvVar.keys.CAPTAIN_HOST_HTTPS_PORT,
value: CaptainConstants.configs.nginxPortNumber443 + '',
key: EnvVar.keys.CAPTAIN_HOST_HTTPS_PORT,
value: CaptainConstants.configs.nginxPortNumber443 + '',
})
if (EnvVar.DEFAULT_PASSWORD) {

16
src/utils/EnvVars.ts
View File

@@ -1,4 +1,3 @@
/**
* Normalize a port into a number, string, or false.
*/
@@ -42,11 +41,20 @@ export default {
CAPTAIN_IS_DEBUG: !!process.env.CAPTAIN_IS_DEBUG,
// Host ports - external to container. Refer it via CaptainConstants.configs.nginxPortNumber80
CAPTAIN_HOST_HTTP_PORT: normalizePort(process.env.CAPTAIN_HOST_HTTP_PORT, 80),//Tested with 10080
CAPTAIN_HOST_HTTP_PORT: normalizePort(
process.env.CAPTAIN_HOST_HTTP_PORT,
80
), //Tested with 10080
// Host ports - external to container. Refer it via CaptainConstants.configs.nginxPortNumber443
CAPTAIN_HOST_HTTPS_PORT: normalizePort(process.env.CAPTAIN_HOST_HTTPS_PORT, 443),//Tested with 10443
CAPTAIN_HOST_HTTPS_PORT: normalizePort(
process.env.CAPTAIN_HOST_HTTPS_PORT,
443
), //Tested with 10443
// Host ports - external to container. Refer it via CaptainConstants.configs.adminPortNumber3000
CAPTAIN_HOST_ADMIN_PORT: normalizePort(process.env.CAPTAIN_HOST_ADMIN_PORT, 3000),//Tested with 13000
CAPTAIN_HOST_ADMIN_PORT: normalizePort(
process.env.CAPTAIN_HOST_ADMIN_PORT,
3000
), //Tested with 13000
MAIN_NODE_IP_ADDRESS: process.env.MAIN_NODE_IP_ADDRESS,