Compare commits

...

4 Commits

Author SHA1 Message Date
9f03939070 monaba: init
i realized i cant even use monaba on arm, just committing it for future purposes

Signed-off-by: natto1784 <natto@weirdnatto.in>
2022-11-17 22:56:47 +05:30
e255ced87f concourse: bump
Signed-off-by: natto1784 <natto@weirdnatto.in>
2022-11-17 22:56:19 +05:30
2b09c8a6af simpler-filehost: init
Signed-off-by: natto1784 <natto@weirdnatto.in>
2022-11-02 15:52:16 +05:30
b3caa19b55 woodpecker: update files
Signed-off-by: natto1784 <natto@weirdnatto.in>
2022-11-02 15:52:04 +05:30
6 changed files with 143 additions and 23 deletions

View File

@@ -25,17 +25,13 @@ job "concourse-worker" {
task "concourse" {
driver = "docker"
config {
image = "rdclda/concourse:7.7.0"
image = "rdclda/concourse:7.8.3"
command = "worker"
image_pull_timeout = "30m"
privileged = true
volumes = [ "/var/lib/nomad-st/concourse-worker:/work"]
entrypoint = [ "dumb-init", "/work/entrypoint.sh" ]
}
resources {
cpu = 2048
memory = 2048
}
template {
data = <<EOF
{{ with secret (printf "kv/data/concourse/workers/%s" (env "node.unique.name") )}}{{ .Data.data.worker_key }}{{ end }}

View File

@@ -59,23 +59,15 @@ EOF
POSTGRES_PASSWORD_FILE="${NOMAD_SECRETS_DIR}/cc-db.pass"
POSTGRES_DB = "concourse"
}
resources {
cpu = 250
memory = 128
}
}
task "concourse" {
driver = "docker"
config {
image = "rdclda/concourse:7.7.0"
image = "rdclda/concourse:7.8.3"
command = "web"
image_pull_timeout = "30m"
ports = ["http", "tsa" ]
}
resources {
cpu = 250
memory = 128
}
template {
data = <<EOF
{{ with secret "kv/data/concourse/keys" }}

94
monaba/monaba.nomad Normal file
View File

@@ -0,0 +1,94 @@
job "monaba" {
region = "global"
datacenters = [ "nazrin" ]
type = "service"
group "svc" {
count = 1
network {
mode = "bridge"
port "http" {
static = 4004
to = 80
}
port "db" {
to = 5432
}
}
service {
name = "gitea-http"
port = "http"
}
vault {
policies = [ "monaba" ]
}
task "db" {
driver = "docker"
config {
image = "postgres:alpine"
ports = ["db"]
hostname = "db"
volumes = [ "/var/lib/nomad-st/monaba/postgres:/var/lib/postgresql/data" ]
network_mode = "monabanet"
}
template {
data = <<EOF
{{with secret "kv/data/monaba"}}
POSTGRES_USER=monaba
POSTGRES_DB=monaba
POSTGRES_PASSWORD={{.Data.data.dbpass}}
{{end}}
EOF
env = true
destination = "${NOMAD_SECRETS_DIR}/data.env"
}
resources {
cpu = 200
memory = 128
}
}
task "app" {
driver = "docker"
config {
image = "docker.pkg.github.com/ahushh/monaba/app:latest"
hostname = "app"
volumes = [ "/var/lib/nomad-st/monaba/upload:/opt/monaba/upload",
"/var/lib/nomad-st/monaba/banners:/opt/monaba/static/banners",
"/var/lib/nomad-st/monaba/settings.yml:/var/settings.yml"
]
network_mode = "monabanet"
}
template {
data = <<EOF
{{with secret "kv/data/monaba"}}
PGUSER=monaba
PGDATABASE=monaba
PGPASS={{.Data.data.dbpass}}
{{end}}
PGHOST_APP=db
SEARCH_HOST=search
MAX_UPLOAD_SIZE=50
EOF
env = true
destination = "${NOMAD_SECRETS_DIR}/data.env"
}
}
task "webserver" {
driver = "docker"
config {
image = "docker.pkg.github.com/ahushh/monaba/webserver:latest"
ports = ["http"]
volumes = [ "/var/lib/nomad-st/monaba/upload:/opt/monaba/upload" ]
network_mode = "monabanet"
}
}
task "search" {
driver = "docker"
config {
image = "docker.pkg.github.com/ahushh/monaba/search:latest"
hostname = "search"
volumes = [ "/var/lib/nomad-st/monaba/searchdata:/var/lib/sphinxsearch/data" ]
network_mode = "monabanet"
}
}
}
}

View File

@@ -0,0 +1,37 @@
job "simpler-filehost" {
region = "global"
datacenters = [ "nazrin" ]
type = "service"
group "svc" {
count = 1
network {
mode = "bridge"
port "http" {
static = 8888
to = 8000
}
}
task "simpler-filehost" {
driver = "docker"
config {
image = "natto17/simpler-filehost:latest"
ports = ["http"]
volumes = [ "/var/lib/files:/var/files", "/tmp:/tmp" ]
}
env {
USER_URL = "https://f.weirdnatto.in"
ROCKET_LIMITS = "{file=\"512MB\",data-form=\"512MB\"}"
ROCKET_LOG_LEVEL = "debug"
}
resources {
cpu = 500
memory = 256
}
service {
name = "simpler-filehost"
port = "http"
}
}
}
}

View File

@@ -13,6 +13,7 @@ job "woodpecker-agent" {
}
service {
name = "woodpecker-grpc-agent"
connect {
sidecar_service {
proxy {
@@ -30,7 +31,7 @@ job "woodpecker-agent" {
driver = "docker"
config {
image = "woodpeckerci/woodpecker-agent:latest"
image = "woodpeckerci/woodpecker-agent:next"
command = "agent"
volumes = [ "/var/run/docker.sock:/var/run/docker.sock"]
}
@@ -42,7 +43,7 @@ job "woodpecker-agent" {
template {
data = <<EOF
WOODPECKER_LOG_LEVEL=info
WOODPECKER_LOG_LEVEL=trace
WOODPECKER_USERNAME=Marisa
WOODPECKER_AGENT_SECRET={{ with secret "kv/data/woodpecker/agent" }}{{ .Data.data.agent_secret }}{{ end }}
WOODPECKER_MAX_PROCS=2

View File

@@ -67,10 +67,10 @@ EOF
task "woodpecker" {
driver = "docker"
config {
image = "woodpeckerci/woodpecker-server:latest"
image = "woodpeckerci/woodpecker-server:next"
command = "web"
image_pull_timeout = "30m"
ports = [ "http" ]
ports = [ "http", "grpc" ]
}
resources {
@@ -81,7 +81,7 @@ EOF
template {
data = <<EOF
{{ with secret "kv/data/woodpecker/keys" }}
WOODPECKER_LOG_LEVEL=info
WOODPECKER_LOG_LEVEL=trace
WOODPECKER_HOST={{ .Data.data.external_host }}
WOODPECKER_AGENT_SECRET={{ .Data.data.agent_secret }}
{{end}}