Compare commits
14 Commits
64415239ca
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 44a573f6e0 | |||
| ba379b253e | |||
| 55c7287b3d | |||
| b6aeb47fa4 | |||
| d0c791f477 | |||
| 481a0b9744 | |||
| a6a8f4c97a | |||
| 2302897460 | |||
| a08c59bcb2 | |||
| 5850a237ce | |||
| 5b8deb8a67 | |||
| b5ae8ff0ce | |||
| 0ccef4583a | |||
| 7b3b7623be |
@@ -68,4 +68,5 @@ DEV-*
|
|||||||
# Ignore custom Prosody hosts.
|
# Ignore custom Prosody hosts.
|
||||||
Config/Prosody/conf.avail
|
Config/Prosody/conf.avail
|
||||||
Config/Prosody/etc/conf.avail
|
Config/Prosody/etc/conf.avail
|
||||||
|
Config/Prosody/etc/
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ FROM debian:trixie-slim
|
|||||||
## Setup ##
|
## Setup ##
|
||||||
# System Dependencies
|
# System Dependencies
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y prosody \
|
apt-get install -y prosody prosody-modules ca-certificates \
|
||||||
bash sudo htop \
|
bash sudo htop \
|
||||||
vim
|
vim
|
||||||
|
|
||||||
@@ -21,11 +21,9 @@ COPY ./etc/conf.avail/* /etc/prosody/conf.d/
|
|||||||
RUN rm -rfv /etc/prosody/README*
|
RUN rm -rfv /etc/prosody/README*
|
||||||
|
|
||||||
## Main ##
|
## Main ##
|
||||||
# Install + Run Website
|
|
||||||
WORKDIR /root
|
WORKDIR /root
|
||||||
USER root
|
USER root
|
||||||
CMD prosodyctl --root cert import /etc/letsencrypt/live && \
|
CMD prosodyctl --root cert import /etc/letsencrypt/live && \
|
||||||
service prosody start && \
|
service prosody start && \
|
||||||
prosodyctl reload && \
|
|
||||||
tail -F /var/log/prosody/prosody.log & \
|
tail -F /var/log/prosody/prosody.log & \
|
||||||
tail -F /var/log/prosody/prosody.err
|
tail -F /var/log/prosody/prosody.err
|
||||||
|
|||||||
@@ -14,6 +14,12 @@ volumes:
|
|||||||
type: none
|
type: none
|
||||||
device: ../../Volumes/ReverseProxy/letsencrypt/live
|
device: ../../Volumes/ReverseProxy/letsencrypt/live
|
||||||
o: bind
|
o: bind
|
||||||
|
prosody_cert_archive:
|
||||||
|
driver: local
|
||||||
|
driver_opts:
|
||||||
|
type: none
|
||||||
|
device: ../../Volumes/ReverseProxy/letsencrypt/archive
|
||||||
|
o: bind
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
@@ -25,6 +31,7 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- 5222:5222
|
- 5222:5222
|
||||||
- 5269:5269
|
- 5269:5269
|
||||||
|
- 5281:5281
|
||||||
#environment:
|
#environment:
|
||||||
# - REPO=$REPO
|
# - REPO=$REPO
|
||||||
# - BRANCH=$BRANCH
|
# - BRANCH=$BRANCH
|
||||||
@@ -39,6 +46,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- prosody_data:/var/lib/prosody/
|
- prosody_data:/var/lib/prosody/
|
||||||
- prosody_certs:/etc/letsencrypt/live
|
- prosody_certs:/etc/letsencrypt/live
|
||||||
|
- prosody_cert_archive:/etc/letsencrypt/archive
|
||||||
deploy:
|
deploy:
|
||||||
mode: global
|
mode: global
|
||||||
resources:
|
resources:
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ VirtualHost "example.com"
|
|||||||
-- Note that old-style SSL on port 5223 only supports one certificate, and will always
|
-- Note that old-style SSL on port 5223 only supports one certificate, and will always
|
||||||
-- use the global one.
|
-- use the global one.
|
||||||
--ssl = {
|
--ssl = {
|
||||||
-- key = "/etc/letsencrypt/live/example.com/privkey.pem";
|
-- key = "/etc/prosody/certs/example.com.key";
|
||||||
-- certificate = "/etc/letsencrypt/live/example.com/fullchain.pem";
|
-- certificate = "/etc/prosody/certs/example.com.crt";
|
||||||
-- }
|
-- }
|
||||||
|
|
||||||
------ Components ------
|
------ Components ------
|
||||||
|
|||||||
@@ -1,16 +1,20 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
sh -c "rm -rfv prov-test"
|
local_clone="git-repo"
|
||||||
|
|
||||||
|
sh -c "rm -rfv $local_clone"
|
||||||
|
|
||||||
echo "Downloading Repo '$REPO' : Branch '$BRANCH'"
|
echo "Downloading Repo '$REPO' : Branch '$BRANCH'"
|
||||||
git clone $REPO --branch=$BRANCH prov-test
|
git clone $REPO --branch=$BRANCH $local_clone
|
||||||
|
|
||||||
cd prov-test
|
cd $local_clone
|
||||||
|
|
||||||
echo "Starting Executable Script '$EXEC'"
|
echo "Starting Executable Script '$EXEC'"
|
||||||
|
|
||||||
tail -F /var/mail/mail &
|
if [[ "$KEEP_ALIVE" == "Y" ]]; then
|
||||||
tail -F /var/mail/ansible &
|
tail -F /var/mail/mail &
|
||||||
|
tail -F /var/mail/ansible &
|
||||||
|
fi
|
||||||
|
|
||||||
logfile="/root/test.log"
|
logfile="/root/test.log"
|
||||||
$EXEC > $logfile &
|
$EXEC > $logfile &
|
||||||
|
|||||||
Executable
+24
@@ -0,0 +1,24 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# 20260804 - Hyperling
|
||||||
|
|
||||||
|
DIR="$(dirname -- "${BASH_SOURCE[0]}")"
|
||||||
|
source $DIR/.env
|
||||||
|
|
||||||
|
## Parameters ##
|
||||||
|
|
||||||
|
num_lines="$1"
|
||||||
|
if [[ -z "$num_lines" ]]; then
|
||||||
|
num_lines=20
|
||||||
|
fi
|
||||||
|
|
||||||
|
## Setup ##
|
||||||
|
|
||||||
|
source $DIR/.env
|
||||||
|
|
||||||
|
## Main ##
|
||||||
|
|
||||||
|
ls $PT_STORAGE_DIR/*/test.log | while read test_log; do
|
||||||
|
echo -e "\n*** $test_log ***\n"
|
||||||
|
tail -n $num_lines $test_log
|
||||||
|
echo -e "\n\n"
|
||||||
|
done
|
||||||
@@ -20,13 +20,14 @@ services:
|
|||||||
args:
|
args:
|
||||||
PACKAGES: ${PACKAGES}
|
PACKAGES: ${PACKAGES}
|
||||||
EXTRA_ARCH: ${EXTRA_ARCH}
|
EXTRA_ARCH: ${EXTRA_ARCH}
|
||||||
restart: no
|
restart: "no"
|
||||||
environment:
|
environment:
|
||||||
- PACKAGES=$PACKAGES
|
- PACKAGES=$PACKAGES
|
||||||
- EXTRA_ARCH=$EXTRA_ARCH
|
- EXTRA_ARCH=$EXTRA_ARCH
|
||||||
- REPO=$REPO
|
- REPO=$REPO
|
||||||
- BRANCH=$BRANCH
|
- BRANCH=$BRANCH
|
||||||
- EXEC=$EXEC
|
- EXEC=$EXEC
|
||||||
|
- KEEP_ALIVE=$KEEP_ALIVE
|
||||||
volumes:
|
volumes:
|
||||||
- type: volume
|
- type: volume
|
||||||
source: pt-storage
|
source: pt-storage
|
||||||
@@ -49,13 +50,14 @@ services:
|
|||||||
args:
|
args:
|
||||||
PACKAGES: ${PACKAGES}
|
PACKAGES: ${PACKAGES}
|
||||||
EXTRA_DEBIAN: ${EXTRA_DEBIAN}
|
EXTRA_DEBIAN: ${EXTRA_DEBIAN}
|
||||||
restart: no
|
restart: "no"
|
||||||
environment:
|
environment:
|
||||||
- PACKAGES=$PACKAGES
|
- PACKAGES=$PACKAGES
|
||||||
- EXTRA_DEBIAN=$EXTRA_DEBIAN
|
- EXTRA_DEBIAN=$EXTRA_DEBIAN
|
||||||
- REPO=$REPO
|
- REPO=$REPO
|
||||||
- BRANCH=$BRANCH
|
- BRANCH=$BRANCH
|
||||||
- EXEC=$EXEC
|
- EXEC=$EXEC
|
||||||
|
- KEEP_ALIVE=$KEEP_ALIVE
|
||||||
volumes:
|
volumes:
|
||||||
- type: volume
|
- type: volume
|
||||||
source: pt-storage
|
source: pt-storage
|
||||||
@@ -78,13 +80,14 @@ services:
|
|||||||
args:
|
args:
|
||||||
PACKAGES: ${PACKAGES}
|
PACKAGES: ${PACKAGES}
|
||||||
EXTRA_FEDORA: ${EXTRA_FEDORA}
|
EXTRA_FEDORA: ${EXTRA_FEDORA}
|
||||||
restart: no
|
restart: "no"
|
||||||
environment:
|
environment:
|
||||||
- PACKAGES=$PACKAGES
|
- PACKAGES=$PACKAGES
|
||||||
- EXTRA_FEDORA=$EXTRA_FEDORA
|
- EXTRA_FEDORA=$EXTRA_FEDORA
|
||||||
- REPO=$REPO
|
- REPO=$REPO
|
||||||
- BRANCH=$BRANCH
|
- BRANCH=$BRANCH
|
||||||
- EXEC=$EXEC
|
- EXEC=$EXEC
|
||||||
|
- KEEP_ALIVE=$KEEP_ALIVE
|
||||||
volumes:
|
volumes:
|
||||||
- type: volume
|
- type: volume
|
||||||
source: pt-storage
|
source: pt-storage
|
||||||
@@ -107,13 +110,14 @@ services:
|
|||||||
args:
|
args:
|
||||||
PACKAGES: ${PACKAGES}
|
PACKAGES: ${PACKAGES}
|
||||||
EXTRA_OPENSUSE: ${EXTRA_OPENSUSE}
|
EXTRA_OPENSUSE: ${EXTRA_OPENSUSE}
|
||||||
restart: no
|
restart: "no"
|
||||||
environment:
|
environment:
|
||||||
- PACKAGES=$PACKAGES
|
- PACKAGES=$PACKAGES
|
||||||
- EXTRA_OPENSUSE=$EXTRA_OPENSUSE
|
- EXTRA_OPENSUSE=$EXTRA_OPENSUSE
|
||||||
- REPO=$REPO
|
- REPO=$REPO
|
||||||
- BRANCH=$BRANCH
|
- BRANCH=$BRANCH
|
||||||
- EXEC=$EXEC
|
- EXEC=$EXEC
|
||||||
|
- KEEP_ALIVE=$KEEP_ALIVE
|
||||||
volumes:
|
volumes:
|
||||||
- type: volume
|
- type: volume
|
||||||
source: pt-storage
|
source: pt-storage
|
||||||
@@ -136,13 +140,14 @@ services:
|
|||||||
args:
|
args:
|
||||||
PACKAGES: ${PACKAGES}
|
PACKAGES: ${PACKAGES}
|
||||||
EXTRA_UBUNTU: ${EXTRA_UBUNTU}
|
EXTRA_UBUNTU: ${EXTRA_UBUNTU}
|
||||||
restart: no
|
restart: "no"
|
||||||
environment:
|
environment:
|
||||||
- PACKAGES=$PACKAGES
|
- PACKAGES=$PACKAGES
|
||||||
- EXTRA_UBUNTU=$EXTRA_UBUNTU
|
- EXTRA_UBUNTU=$EXTRA_UBUNTU
|
||||||
- REPO=$REPO
|
- REPO=$REPO
|
||||||
- BRANCH=$BRANCH
|
- BRANCH=$BRANCH
|
||||||
- EXEC=$EXEC
|
- EXEC=$EXEC
|
||||||
|
- KEEP_ALIVE=$KEEP_ALIVE
|
||||||
volumes:
|
volumes:
|
||||||
- type: volume
|
- type: volume
|
||||||
source: pt-storage
|
source: pt-storage
|
||||||
|
|||||||
@@ -21,3 +21,4 @@ EXTRA_UBUNTU=""
|
|||||||
REPO=https://git.hyperling.com/me/env-ansible
|
REPO=https://git.hyperling.com/me/env-ansible
|
||||||
BRANCH=stage
|
BRANCH=stage
|
||||||
EXEC="./setup.sh -l -g -s"
|
EXEC="./setup.sh -l -g -s"
|
||||||
|
#KEEP_ALIVE=Y
|
||||||
|
|||||||
Reference in New Issue
Block a user