Skip to content

Commit

Permalink
Prepare for other messengers
Browse files Browse the repository at this point in the history
See #63 and #64
  • Loading branch information
alexanderfefelov committed Mar 15, 2021
1 parent 323f6a9 commit 92cac1a
Show file tree
Hide file tree
Showing 30 changed files with 20 additions and 10 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@ Before you start, run [check-prerequisites.sh](check-prerequisites.sh) to make s
- [Telegraf](influxdata/telegraf)
- [Jenkins](jenkins)
- [LibreSpeed](librespeed)
- [Mattermost](mattermost)
- [Message queues](message-queues)
- [ActiveMQ](message-queues/activemq), cluster
- [RabbitMQ](message-queues/rabbitmq)
- [Messengers](messengers)
- [Mattermost](messengers/mattermost)
- [Minecraft](minecraft)
- [NetBox](netbox)
- [Netdata](netdata)
Expand Down
5 changes: 4 additions & 1 deletion dns/coredns/build/template.hosts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ $IP_ADDRESS grafana.backpack.test
$IP_ADDRESS graphite-statsd.backpack.test
$IP_ADDRESS jenkins.backpack.test
$IP_ADDRESS librespeed.backpack.test
$IP_ADDRESS mattermost.backpack.test
$IP_ADDRESS minecraft.backpack.test
$IP_ADDRESS netbox.backpack.test
$IP_ADDRESS redis.backpack.test
Expand Down Expand Up @@ -92,6 +91,10 @@ $IP_ADDRESS activemq-node-2.backpack.test
$IP_ADDRESS activemq-node-3.backpack.test
$IP_ADDRESS rabbitmq.backpack.test

# Messengers
#
$IP_ADDRESS mattermost.backpack.test

# Network monitoring
#
$IP_ADDRESS fastnetmon.backpack.test
Expand Down
2 changes: 1 addition & 1 deletion doc/architecture.graphml
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ https://github.com/alexanderfefelov/docker-backpack]]></data>
</graph>
</node>
<node id="n23">
<data key="d4"><![CDATA[https://github.com/alexanderfefelov/docker-backpack/tree/main/mattermost]]></data>
<data key="d4"><![CDATA[https://github.com/alexanderfefelov/docker-backpack/tree/main/messengers/mattermost]]></data>
<data key="d6">
<y:ShapeNode>
<y:Geometry height="30.0" width="90.0" x="1052.9594625718776" y="651.1876036233987"/>
Expand Down
5 changes: 4 additions & 1 deletion lib/components
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ grafana
graphite-statsd
jenkins
librespeed
mattermost
minecraft
netbox
redis
Expand Down Expand Up @@ -85,6 +84,10 @@ influxdata/v1/kapacitor
message-queues/activemq
message-queues/rabbitmq

# Messengers
#
messengers/mattermost

# Network monitoring
#
network-monitoring/fastnetmon
Expand Down
5 changes: 4 additions & 1 deletion lib/containers
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ backpack-grafana
backpack-graphite-statsd
backpack-jenkins
backpack-librespeed
backpack-mattermost
backpack-minecraft
backpack-netbox
backpack-redis
Expand Down Expand Up @@ -90,6 +89,10 @@ backpack-activemq-node-2
backpack-activemq-node-3
backpack-rabbitmq

# Messengers
#
backpack-mattermost

# Network monitoring
#
backpack-fastnetmon
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion mattermost/README.md → messengers/mattermost/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# backpack-mattermost

![Mattermost](../doc/assets/logos/mattermost.png)
![Mattermost](../../doc/assets/logos/mattermost.png)

Hostname `mattermost.backpack.test`

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion mattermost/run.sh → messengers/mattermost/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[ $UID -eq 0 ] || exec sudo --preserve-env=VERSION bash "$0" "$@"

. settings.sh
. ../lib/lib.sh
. ../../lib/lib.sh

readonly MYSQL="mysql --host=$DB_HOST --port=$DB_PORT --user=$DB_ROOT_USERNAME --password=$DB_ROOT_PASSWORD"

Expand Down
6 changes: 3 additions & 3 deletions mattermost/settings.sh → messengers/mattermost/settings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ readonly CONTAINER_NAME=$BASE_NAME
readonly HOST_NAME=$MONIKER.backpack.test
readonly WAIT_TIMEOUT=1200

. ../lib/settings/go.sh
. ../lib/settings/health.sh
. ../lib/settings/log.sh
. ../../lib/settings/go.sh
. ../../lib/settings/health.sh
. ../../lib/settings/log.sh

readonly DB_HOST=mysql-main-master.backpack.test
readonly DB_PORT=3306
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 92cac1a

Please sign in to comment.