Tidy up
This commit is contained in:
5
.gitignore
vendored
5
.gitignore
vendored
@@ -1,4 +1,3 @@
|
|||||||
server.crt
|
services/nginx/server.crt
|
||||||
server.key
|
services/nginx/server.key
|
||||||
.env
|
.env
|
||||||
services/nextcloud/db.env
|
|
||||||
|
|||||||
@@ -4,14 +4,18 @@ set -eu
|
|||||||
usage="Usage: $0 server_name project_root"
|
usage="Usage: $0 server_name project_root"
|
||||||
server_name="${1:?$usage}"
|
server_name="${1:?$usage}"
|
||||||
root="${2:?$usage}"
|
root="${2:?$usage}"
|
||||||
|
|
||||||
|
# Configure hostname for Nginx
|
||||||
sed -Ei "s/(^[[:blank:]]*server_name [^_][^.]*\.)[^;]*/\1${server_name}/" "$root"/services/nginx/default.conf
|
sed -Ei "s/(^[[:blank:]]*server_name [^_][^.]*\.)[^;]*/\1${server_name}/" "$root"/services/nginx/default.conf
|
||||||
|
|
||||||
|
# Configure hostname for OpenProject
|
||||||
sed -Ei "s/(^OPENPROJECT_HOST__NAME=[^.]*\.).*/\1${server_name}/" "$root"/.env
|
sed -Ei "s/(^OPENPROJECT_HOST__NAME=[^.]*\.).*/\1${server_name}/" "$root"/.env
|
||||||
|
|
||||||
# Configure hostname for Gitea
|
# Configure hostname for Gitea
|
||||||
# Note that this works only if you use a docker volume named `tvcloud_gitea` (this project default).
|
# Note that this works only if you use a docker volume named `tvcloud_gitea` (this project default).
|
||||||
gitea_conf_file=/var/lib/docker/volumes/tvcloud_gitea/_data/gitea/conf/app.init
|
gitea_conf_file=/var/lib/docker/volumes/tvcloud_gitea/_data/gitea/conf/app.init
|
||||||
if [[ ! -e $gitea_conf_file ]]; then
|
if [[ ! -e $gitea_conf_file ]]; then
|
||||||
mkdir -p $(dirname "$gitea_conf_file")
|
mkdir -p "$(dirname "$gitea_conf_file")"
|
||||||
touch "$gitea_conf_file"
|
touch "$gitea_conf_file"
|
||||||
fi
|
fi
|
||||||
if grep -Eq "\[server\] ROOT_URL = https://gitea\." $gitea_conf_file; then
|
if grep -Eq "\[server\] ROOT_URL = https://gitea\." $gitea_conf_file; then
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ This project is a personal cloud of services:
|
|||||||
1. Generate a self-signed certificate for the proxy.
|
1. Generate a self-signed certificate for the proxy.
|
||||||
|
|
||||||
```
|
```
|
||||||
host=tvcloud.fr
|
host=yourdomain.com
|
||||||
mkcert \
|
mkcert \
|
||||||
-cert-file services/nginx/server.crt \
|
-cert-file services/nginx/server.crt \
|
||||||
-key-file services/nginx/server.key \
|
-key-file services/nginx/server.key \
|
||||||
@@ -24,7 +24,7 @@ See `.example.env`.
|
|||||||
3. Configure the host name.
|
3. Configure the host name.
|
||||||
|
|
||||||
```
|
```
|
||||||
host=tvcloud.fr
|
host=yourdomain.com
|
||||||
sudo ./configure.bash $host .
|
sudo ./configure.bash $host .
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ server {
|
|||||||
|
|
||||||
server {
|
server {
|
||||||
listen 443 ssl;
|
listen 443 ssl;
|
||||||
server_name openproject.tvcloud.fr;
|
server_name openproject.yourdomain.com;
|
||||||
|
|
||||||
ssl_certificate /etc/ssl/crt/server.crt;
|
ssl_certificate /etc/ssl/crt/server.crt;
|
||||||
ssl_certificate_key /etc/ssl/crt/server.key;
|
ssl_certificate_key /etc/ssl/crt/server.key;
|
||||||
@@ -40,7 +40,7 @@ server {
|
|||||||
|
|
||||||
server {
|
server {
|
||||||
listen 443 ssl;
|
listen 443 ssl;
|
||||||
server_name gitea.tvcloud.fr;
|
server_name gitea.yourdomain.com;
|
||||||
|
|
||||||
ssl_certificate /etc/ssl/crt/server.crt;
|
ssl_certificate /etc/ssl/crt/server.crt;
|
||||||
ssl_certificate_key /etc/ssl/crt/server.key;
|
ssl_certificate_key /etc/ssl/crt/server.key;
|
||||||
@@ -61,7 +61,7 @@ server {
|
|||||||
# https://github.com/nextcloud/docker/blob/master/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
|
# https://github.com/nextcloud/docker/blob/master/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
|
||||||
server {
|
server {
|
||||||
listen 443 ssl;
|
listen 443 ssl;
|
||||||
server_name nextcloud.localhost;
|
server_name nextcloud.yourdomain.com;
|
||||||
|
|
||||||
ssl_certificate /etc/ssl/crt/server.crt;
|
ssl_certificate /etc/ssl/crt/server.crt;
|
||||||
ssl_certificate_key /etc/ssl/crt/server.key;
|
ssl_certificate_key /etc/ssl/crt/server.key;
|
||||||
|
|||||||
Reference in New Issue
Block a user