Compare commits
No commits in common. "b794c5e8a9721677001bdc95e65a8bf904ae1bb7" and "26ad8d8232bb734d93d102e30c5c1267586082f0" have entirely different histories.
b794c5e8a9
...
26ad8d8232
@ -14,7 +14,6 @@
|
||||
# 8013: peertube
|
||||
# 8014: parsoid
|
||||
# 8015: prometheus
|
||||
# 8016: woodpecker
|
||||
|
||||
version: '2.4'
|
||||
services:
|
||||
@ -149,39 +148,6 @@ services:
|
||||
- ./gitea:/data
|
||||
- /home/git/.ssh:/data/git/.ssh
|
||||
|
||||
# CI server
|
||||
woodpecker-server:
|
||||
image: laszlocloud/woodpecker-server:latest
|
||||
ports:
|
||||
- 8016:8000
|
||||
- 9000
|
||||
volumes:
|
||||
- ./woodpecker:/var/lib/drone/
|
||||
restart: on-failure
|
||||
environment:
|
||||
- DRONE_OPEN=true
|
||||
- DRONE_HOST=https://ci.monarch-pass.net
|
||||
- DRONE_GITEA=true
|
||||
- DRONE_ADMIN=malacoda
|
||||
- DRONE_GITEA_URL=https://forge.monarch-pass.net
|
||||
- DRONE_GITEA_GIT_USERNAME=Woodpecker
|
||||
- DRONE_GITEA_GIT_PASSWORD=${DRONE_GITEA_GIT_PASSWORD}
|
||||
- DRONE_GITEA_PRIVATE_MODE=true
|
||||
- DRONE_SECRET=${DRONE_SECRET}
|
||||
|
||||
# CI agent
|
||||
woodpecker-agent:
|
||||
image: laszlocloud/woodpecker-agent:latest
|
||||
command: agent
|
||||
restart: on-failure
|
||||
depends_on:
|
||||
- woodpecker-server
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
environment:
|
||||
- DRONE_SERVER=woodpecker-server:9000
|
||||
- DRONE_SECRET=${DRONE_SECRET}
|
||||
|
||||
# glitchcity.info
|
||||
glitchcity:
|
||||
links:
|
||||
|
@ -1,27 +0,0 @@
|
||||
server {
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name @SERVER_NAME@;
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
|
||||
client_max_body_size 100G;
|
||||
|
||||
server_name @SERVER_NAME@;
|
||||
|
||||
access_log /var/log/nginx/@SERVER_NAME@/access.log;
|
||||
error_log /var/log/nginx/@SERVER_NAME@/error.log;
|
||||
|
||||
location /.well-known/ {
|
||||
root /var/www/html/;
|
||||
try_files $uri $uri/ =404;
|
||||
}
|
||||
|
||||
location / {
|
||||
proxy_pass http://127.0.0.1:@PORT@/;
|
||||
}
|
||||
}
|
26
nginxify
26
nginxify
@ -1,26 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
SERVER_NAME=$1
|
||||
PORT=$2
|
||||
|
||||
NGINX_CONFIG=/etc/nginx
|
||||
AVAILABLE_SITES="$NGINX_CONFIG/sites-available"
|
||||
ENABLED_SITES="$NGINX_CONFIG/sites-enabled"
|
||||
|
||||
NGINX_CONF_TEMPLATE=nginx.conf.template
|
||||
NGINX_CONF_NAME="$SERVER_NAME.conf"
|
||||
|
||||
NGINX_LOGS=/var/log/nginx
|
||||
|
||||
cp $NGINX_CONF_TEMPLATE "$AVAILABLE_SITES/$NGINX_CONF_NAME"
|
||||
cd $AVAILABLE_SITES
|
||||
sed -i "s/@SERVER_NAME@/$SERVER_NAME/g" $NGINX_CONF_NAME
|
||||
sed -i "s/@PORT@/$PORT/g" $NGINX_CONF_NAME
|
||||
|
||||
cd $ENABLED_SITES
|
||||
ln -s "../sites-available/$NGINX_CONF_NAME" .
|
||||
|
||||
mkdir -p "$NGINX_LOGS/$SERVER_NAME"
|
||||
|
||||
service nginx reload
|
||||
|
Loading…
x
Reference in New Issue
Block a user