-
Notifications
You must be signed in to change notification settings - Fork 8
gitlab starts #10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
gitlab starts #10
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| GITLAB_TRAEFIK_HOST=git.example.com | ||
| GITLAB_SSH_PORT=2224 | ||
| # Choose Let's Encrypt 'staging' or 'production' environment: | ||
| ACME_CERT_RESOLVER=production | ||
|
|
||
| POSTGRES_USER=gitlab | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These should all be namespaced like GITLAB_POSTGRES_USER (In theory, you should be able to concatenate all of the d.rymcg.tech project .env files together into one and not have any overlaps) |
||
| POSTGRES_HOST=postgresql | ||
| POSTGRES_PORT=5432 | ||
| POSTGRES_PASS=password | ||
| POSTGRES_DB_NAME=gitlab_production | ||
| GITLAB_ROOT_PASSWORD=changeme | ||
|
Comment on lines
+9
to
+11
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. passwords should be blank in .env-dist, otherwise the Makefile won't randomize it.
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. please add a newline |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| ROOT_DIR = .. | ||
| include ../_scripts/Makefile.projects | ||
|
|
||
| .PHONY: config # Configure .env file | ||
| config: | ||
|
jessopb marked this conversation as resolved.
|
||
| @${BIN}/reconfigure_ask ${ENV_FILE} GITLAB_TRAEFIK_HOST "Enter your gitlab domain name" "gl.${ROOT_DOMAIN}" | ||
| @${BIN}/reconfigure_ask ${ENV_FILE} APP_NAME "Enter the service description" "git thing" | ||
| @[[ -z "$$(dotenv -f ${ENV_FILE} get POSTGRES_PASS)" ]] && ${BIN}/reconfigure ${ENV_FILE} POSTGRES_PASS=$(shell openssl rand -hex 45) || true | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. dotenv should be ${BIN}/dotenv
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can now use the reconfigure_password script instead of this. |
||
| @[[ -z "$$(dotenv -f ${ENV_FILE} get GITLAB_ROOT_PASSWORD)" ]] && ${BIN}/reconfigure ${ENV_FILE} GITLAB_ROOT_PASSWORD=$(shell openssl rand -hex 45) || true | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # Gitea | ||
|
|
||
| [Gitlab](https://gitlab.com/) is a git repository host, similar to GitHub, but | ||
| entirely self-hosted. More description forthcoming... | ||
|
|
||
| ## Configuration | ||
|
|
||
| Copy `.env-dist` to `.env`, and edit variables accordingly. | ||
|
|
||
| * `GITLAB_TRAEFIK_HOST` to the external domain name forwarded from traefik, eg. | ||
| `git.example.com` | ||
|
|
||
| Config documention forthcoming... | ||
|
|
||
| ## Initial setup | ||
|
|
||
| Bring up the service with `docker-compose up -d` | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Lets use the make config |
||
| Initial setup documentation forthcoming... | ||
|
|
||
| ``` | ||
| # Restart gitlab to get the config applied: | ||
| docker-compose restart | ||
| ``` | ||
|
|
||
| ## Notes | ||
|
|
||
| Traefik listens for SSH connections on TCP port 2224 and forwards directly to | ||
| the builtin Gitlab SSH service. | ||
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,79 @@ | ||||||||||
| version: "3.3" | ||||||||||
|
|
||||||||||
| networks: | ||||||||||
| traefik-proxy: | ||||||||||
| name: traefik-proxy | ||||||||||
|
|
||||||||||
| services: | ||||||||||
| redis: | ||||||||||
| restart: always | ||||||||||
| image: redis:latest | ||||||||||
| security_opt: | ||||||||||
| - no-new-privileges:true | ||||||||||
| command: | ||||||||||
| - --loglevel warning | ||||||||||
| volumes: | ||||||||||
| - redis:/var/lib/redis | ||||||||||
| postgresql: | ||||||||||
| image: postgres:14 | ||||||||||
| restart: unless-stopped | ||||||||||
| security_opt: | ||||||||||
| - no-new-privileges:true | ||||||||||
|
jessopb marked this conversation as resolved.
|
||||||||||
| volumes: | ||||||||||
| - postgres:/var/lib/postgresql/data | ||||||||||
| environment: | ||||||||||
| - DB_NAME=${POSTGRES_DB_NAME} | ||||||||||
| - DB_USER=${POSTGRES_USER} | ||||||||||
| - DB_PASS=${POSTGRES_PASS} | ||||||||||
| healthcheck: | ||||||||||
| test: | ||||||||||
| [ | ||||||||||
| "CMD-SHELL", | ||||||||||
| "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB_NAME" | ||||||||||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is double $$ correct here? |
||||||||||
| ] | ||||||||||
| gitlab: | ||||||||||
| image: gitlab/gitlab-ce:latest | ||||||||||
| container_name: gitlab | ||||||||||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. remove the container name to support multiple instances. |
||||||||||
| restart: always | ||||||||||
| environment: | ||||||||||
| DEBUG: 'true' | ||||||||||
| DB_ADAPTER: postgresql | ||||||||||
| DB_HOST: postgresql | ||||||||||
| DB_PORT: 5432 | ||||||||||
| DB_USER: ${POSTGRES_USER} | ||||||||||
| DB_PASS: ${POSTGRES_PASS} | ||||||||||
| DB_NAME: ${POSTGRES_DB_NAME} | ||||||||||
| GITLAB_ROOT_PASSWORD: ${GITLAB_ROOT_PASSWORD} | ||||||||||
| GITLAB_HOST: https://${GITLAB_TRAEFIK_HOST} | ||||||||||
| GITLAB_OMNIBUS_CONFIG: | | ||||||||||
| gitlab_rails['gitlab_shell_ssh_port'] = ${GITLAB_SSH_PORT} | ||||||||||
| networks: | ||||||||||
| - traefik-proxy | ||||||||||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we're not using the traefik-proxy network anymore, no networks need to be configured. |
||||||||||
| security_opt: | ||||||||||
| - no-new-privileges:true | ||||||||||
| volumes: | ||||||||||
| - data:/var/lib/gitlab | ||||||||||
| - config:/etc/gitlab | ||||||||||
| - /etc/timezone:/etc/timezone:ro | ||||||||||
| - /etc/localtime:/etc/localtime:ro | ||||||||||
| labels: | ||||||||||
| - "traefik.enable=true" | ||||||||||
| ## Web | ||||||||||
| - "traefik.http.routers.gitlab-web.rule=Host(`${GITLAB_TRAEFIK_HOST}`)" | ||||||||||
| - "traefik.http.routers.gitlab-web.entrypoints=websecure" | ||||||||||
| - "traefik.http.routers.gitlab-web.service=gitlab-web" | ||||||||||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. specifying the service is not necessary, traefik will autodetect this. |
||||||||||
| - "traefik.http.routers.gitlab-web.tls.certresolver=${ACME_CERT_RESOLVER}" | ||||||||||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. certresolvers aren't needed anymore that we are using manual cert creation with |
||||||||||
| - "traefik.http.services.gitlab-web.loadbalancer.server.port=80" | ||||||||||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. server.port is not required as long as the image properly specified an |
||||||||||
| ## SSH | ||||||||||
| - "traefik.tcp.routers.gitlab-ssh.rule=HostSNI(`*`)" | ||||||||||
| - "traefik.tcp.routers.gitlab-ssh.entrypoints=ssh" | ||||||||||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. d.rymcg.tech/traefik/config/traefik.yml Lines 115 to 118 in 9728d87
|
||||||||||
| - "traefik.tcp.routers.gitlab-ssh.service=gitlab-ssh" | ||||||||||
| - "traefik.tcp.services.gitlab-ssh.loadbalancer.server.port=22" | ||||||||||
|
|
||||||||||
| volumes: | ||||||||||
| data: | ||||||||||
| config: | ||||||||||
| redis: | ||||||||||
| postgres: | ||||||||||
|
|
||||||||||
|
|
||||||||||
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACME_CERT_RESOLVER is no longer used