Reorganize app/ and add script for secret management #29

Merged
quentin merged 5 commits from test_reorganize into master 2021-01-18 07:18:23 +00:00
188 changed files with 52 additions and 112 deletions
Showing only changes of commit c74dc92feb - Show all commits

View file

@ -1,6 +1,6 @@
# Blacklist everything cleverly
*
!*/
*/secrets/*
!*/secrets/*/
# Whitelist some patterns
!*.sample

View file

@ -1,16 +0,0 @@
FROM amd64/debian:stretch as builder
COPY ./quentin.dufour.io/Gemfile /root/quentin.dufour.io/Gemfile
WORKDIR /root/quentin.dufour.io
RUN apt-get update && \
apt-get install -y ruby-dev gem build-essential bundler zlib1g-dev libxml2-dev && \
bundle install
COPY ./quentin.dufour.io/ /root/quentin.dufour.io/
RUN bundle exec jekyll build
FROM superboum/amd64_webserver:v2
COPY --from=builder /root/quentin.dufour.io/_site /srv/http

View file

@ -1 +0,0 @@
sudo docker build -t superboum/amd64_blog:v19 .

View file

@ -1,8 +0,0 @@
FROM amd64/debian:buster
RUN apt-get update && \
apt-get dist-upgrade -y && \
apt-get install -y \
coturn
CMD ["/usr/bin/turnserver"]

View file

@ -1,17 +0,0 @@
## Génère l'image
```
sudo docker build -t registry.gitlab.com/superboum/ankh-morpork/amd64_coturn:v1 .
```
## Run bash dans le container
```
sudo docker run --rm -t -i registry.gitlab.com/superboum/ankh-morpork/amd64_coturn:v1 bash
sudo docker run --rm -t -i -p 3478:3478/udp -p 3479:3479/udp -p 3478:3478/tcp -p 3479:3479/tcp registry.gitlab.com/superboum/ankh-morpork/amd64_coturn:v1
```
## Used ports
- udp/tcp 3478 3479
## Publish
sudo docker push registry.gitlab.com/superboum/ankh-morpork/amd64_coturn:v1

View file

@ -1,3 +0,0 @@
```
docker build -t superboum/amd64_landing:v8 .
```

View file

@ -1,9 +0,0 @@
FROM golang:1.11.1-stretch as builder
COPY ./goStatic /goStatic
WORKDIR /goStatic
RUN CGO_ENABLED=0 go build -a -o web-server .
FROM scratch
COPY --from=builder /goStatic/web-server /
ENTRYPOINT ["/web-server"]

View file

@ -1,5 +0,0 @@
```
sudo docker build -t superboum/amd64_webserver:v3 .
sudo docker push superboum/amd64_webserver:v3
```

@ -1 +0,0 @@
Subproject commit 3f97f57aaee09a142afe3ca0f1a5d51acd856436

View file

@ -35,7 +35,7 @@ job "directory" {
}
template {
data = file("../config/configuration/directory/bottin/config.json")
data = file("../config/bottin/config.json")
destination = "secrets/config.json"
}
@ -78,7 +78,7 @@ job "directory" {
}
template {
data = file("../config/configuration/directory/guichet/config.json.tpl")
data = file("../config/guichet/config.json.tpl")
destination = "secrets/config.json"
}

View file

@ -3,7 +3,7 @@ services:
mariadb:
build:
context: ./mariadb
context: ./seafile/build/mariadb
args:
VERSION: 4 # fake for now
image: superboum/amd64_mariadb:v4
@ -11,7 +11,7 @@ services:
# Instant Messaging
riot:
build:
context: ./riotweb
context: ./im/build/riotweb
args:
# https://github.com/vector-im/riot-web/releases
VERSION: 1.7.16
@ -19,7 +19,7 @@ services:
synapse:
build:
context: ./matrix-synapse
context: ./im/build/matrix-synapse
args:
# https://github.com/matrix-org/synapse/releases
VERSION: 1.25.0
@ -28,7 +28,7 @@ services:
# Email
sogo:
build:
context: ./sogo
context: ./email/build/sogo
args:
# fake for now
VERSION: 5.0.0
@ -36,7 +36,7 @@ services:
alps:
build:
context: ./alps
context: ./email/build/alps
args:
VERSION: 5cef0aaff2b8b6ee3e00b566123517e241d8cfb8
image: superboum/amd64_alps:v1
@ -44,7 +44,7 @@ services:
# VoIP
jitsi-meet:
build:
context: ./jitsi-meet
context: ./jitsi/build/jitsi-meet
args:
# https://github.com/jitsi/jitsi-meet
PREFIXV: stable/jitsi-meet_
@ -53,7 +53,7 @@ services:
jitsi-conference-focus:
build:
context: ./jitsi-conference-focus
context: ./jitsi/build/jitsi-conference-focus
args:
# https://github.com/jitsi/jicofo
PREFIXV: stable/jitsi-meet_
@ -62,7 +62,7 @@ services:
jitsi-videobridge:
build:
context: ./jitsi-videobridge
context: ./jitsi/build/jitsi-videobridge
args:
# https://github.com/jitsi/jitsi-videobridge
PREFIXV: stable/jitsi-meet_
@ -71,21 +71,21 @@ services:
jitsi-xmpp:
build:
context: ./jitsi-xmpp
context: ./jitsi/build/jitsi-xmpp
args:
VERSION: 0.11.2-1
image: superboum/amd64_jitsi_xmpp:v8
plume:
build:
context: ./plume
context: ./plume/build/plume
args:
VERSION: 0.6.0
image: superboum/plume:v2
postfix:
build:
context: ./postfix
context: ./email/build/postfix
args:
# https://packages.debian.org/fr/buster/postfix
VERSION: 3.4.14-0+deb10u1

View file

@ -131,7 +131,7 @@ job "email" {
}
template {
data = file("../config/configuration/email/dovecot/dovecot-ldap.conf.tpl")
data = file("../config/dovecot/dovecot-ldap.conf.tpl")
destination = "secrets/conf/dovecot-ldap.conf"
perms = "400"
}
@ -200,15 +200,15 @@ job "email" {
}
template {
data = file("../config/configuration/email/dkim/keytable")
data = file("../config/dkim/keytable")
destination = "secrets/dkim/keytable"
}
template {
data = file("../config/configuration/email/dkim/signingtable")
data = file("../config/dkim/signingtable")
destination = "secrets/dkim/signingtable"
}
template {
data = file("../config/configuration/email/dkim/trusted")
data = file("../config/dkim/trusted")
destination = "secrets/dkim/trusted"
}
@ -329,42 +329,42 @@ job "email" {
}
template {
data = file("../config/configuration/email/postfix/ldap-account.cf.tpl")
data = file("../config/postfix/ldap-account.cf.tpl")
destination = "secrets/postfix/ldap-account.cf"
}
template {
data = file("../config/configuration/email/postfix/ldap-alias.cf.tpl")
data = file("../config/postfix/ldap-alias.cf.tpl")
destination = "secrets/postfix/ldap-alias.cf"
}
template {
data = file("../config/configuration/email/postfix/ldap-virtual-domains.cf.tpl")
data = file("../config/postfix/ldap-virtual-domains.cf.tpl")
destination = "secrets/postfix/ldap-virtual-domains.cf"
}
template {
data = file("../config/configuration/email/postfix/dynamicmaps.cf")
data = file("../config/postfix/dynamicmaps.cf")
destination = "secrets/postfix/dynamicmaps.cf"
}
template {
data = file("../config/configuration/email/postfix/header_checks")
data = file("../config/postfix/header_checks")
destination = "secrets/postfix/header_checks"
}
template {
data = file("../config/configuration/email/postfix/main.cf")
data = file("../config/postfix/main.cf")
destination = "secrets/postfix/main.cf"
}
template {
data = file("../config/configuration/email/postfix/master.cf")
data = file("../config/postfix/master.cf")
destination = "secrets/postfix/master.cf"
}
template {
data = file("../config/configuration/email/postfix/transport")
data = file("../config/postfix/transport")
destination = "secrets/postfix/transport"
}
@ -450,7 +450,7 @@ job "email" {
}
template {
data = file("../config/configuration/email/sogo/sogo.conf.tpl")
data = file("../config/sogo/sogo.conf.tpl")
destination = "secrets/sogo.conf"
}

View file

@ -32,7 +32,7 @@ job "garage" {
}
template {
data = file("../config/configuration/garage/garage.toml")
data = file("../config/garage.toml")
destination = "secrets/garage.toml"
}

View file

@ -35,27 +35,27 @@ job "im" {
}
template {
data = file("../config/configuration/chat/synapse/homeserver.yaml")
data = file("../config/synapse/homeserver.yaml")
destination = "secrets/conf/homeserver.yaml"
}
template {
data = file("../config/configuration/chat/easybridge/registration.yaml.tpl")
data = file("../config/easybridge/registration.yaml.tpl")
destination = "secrets/conf/easybridge_registration.yaml"
}
template {
data = file("../config/configuration/chat/synapse/log.yaml")
data = file("../config/synapse/log.yaml")
destination = "secrets/conf/log.yaml"
}
template {
data = file("../config/configuration/chat/synapse/conf.d/server_name.yaml")
data = file("../config/synapse/conf.d/server_name.yaml")
destination = "secrets/conf/server_name.yaml"
}
template {
data = file("../config/configuration/chat/synapse/conf.d/report_stats.yaml")
data = file("../config/synapse/conf.d/report_stats.yaml")
destination = "secrets/conf/report_stats.yaml"
}
@ -152,12 +152,12 @@ job "im" {
}
template {
data = file("../config/configuration/chat/easybridge/registration.yaml.tpl")
data = file("../config/easybridge/registration.yaml.tpl")
destination = "secrets/conf/registration.yaml"
}
template {
data = file("../config/configuration/chat/easybridge/config.json.tpl")
data = file("../config/easybridge/config.json.tpl")
destination = "secrets/conf/config.json"
}
@ -228,7 +228,7 @@ job "im" {
}
template {
data = file("../config/configuration/chat/riot_web/config.json")
data = file("../config/riot_web/config.json")
destination = "secrets/config.json"
}

Some files were not shown because too many files have changed in this diff Show more