Compare commits
merge into: 0k:master
0k:0k/dev/master
0k:backup
0k:bgallet/nextcloud
0k:boris/smtp-extern
0k:charm-codimd-new
0k:cups_service_alpha
0k:dev
0k:dev1
0k:dhcp
0k:element
0k:etherpad-upd
0k:framadate
0k:get-version
0k:lokavaluto/dev/master
0k:master
0k:matomo
0k:new-mailhog-charms
0k:new-monujo-options
0k:nj-collabra-office
0k:nj-keycloak-17.0
0k:nj-organice-charm
0k:nj-vaulwarden-migrate
0k:ntfy-install
0k:odoo_fix_webhook_url
0k:postgres
0k:test
0k:upd-docker
0k:update-latest-synapse
0k:wip
bgallet:0k/dev/master
bgallet:backup
bgallet:bgallet/mattermost
bgallet:boris/docuseal
bgallet:boris/matomo
bgallet:boris/rallly
bgallet:boris/smtp-extern
bgallet:charm-codimd-new
bgallet:cups_service_alpha
bgallet:dev
bgallet:dev1
bgallet:dhcp
bgallet:discourse
bgallet:element
bgallet:etherpad-upd
bgallet:framadate
bgallet:hedgedoc
bgallet:lokavaluto/dev/master
bgallet:master
bgallet:matomo
bgallet:nanoyaml
bgallet:netdata
bgallet:new-mailhog-charms
bgallet:new-monujo-options
bgallet:nextcloud
bgallet:nj-collabra-office
bgallet:nj-keycloak-17.0
bgallet:nj-organice-charm
bgallet:nj-vaulwarden-migrate
bgallet:odoo_fix_webhook_url
bgallet:postgres
bgallet:rallly
bgallet:test
bgallet:upd
bgallet:upd-docker
bgallet:update-latest-synapse
bgallet:wip
pull from: bgallet:dhcp
bgallet:0k/dev/master
bgallet:backup
bgallet:bgallet/mattermost
bgallet:boris/docuseal
bgallet:boris/matomo
bgallet:boris/rallly
bgallet:boris/smtp-extern
bgallet:charm-codimd-new
bgallet:cups_service_alpha
bgallet:dev
bgallet:dev1
bgallet:dhcp
bgallet:discourse
bgallet:element
bgallet:etherpad-upd
bgallet:framadate
bgallet:hedgedoc
bgallet:lokavaluto/dev/master
bgallet:master
bgallet:matomo
bgallet:nanoyaml
bgallet:netdata
bgallet:new-mailhog-charms
bgallet:new-monujo-options
bgallet:nextcloud
bgallet:nj-collabra-office
bgallet:nj-keycloak-17.0
bgallet:nj-organice-charm
bgallet:nj-vaulwarden-migrate
bgallet:odoo_fix_webhook_url
bgallet:postgres
bgallet:rallly
bgallet:test
bgallet:upd
bgallet:upd-docker
bgallet:update-latest-synapse
bgallet:wip
0k:0k/dev/master
0k:backup
0k:bgallet/nextcloud
0k:boris/smtp-extern
0k:charm-codimd-new
0k:cups_service_alpha
0k:dev
0k:dev1
0k:dhcp
0k:element
0k:etherpad-upd
0k:framadate
0k:get-version
0k:lokavaluto/dev/master
0k:master
0k:matomo
0k:new-mailhog-charms
0k:new-monujo-options
0k:nj-collabra-office
0k:nj-keycloak-17.0
0k:nj-organice-charm
0k:nj-vaulwarden-migrate
0k:ntfy-install
0k:odoo_fix_webhook_url
0k:postgres
0k:test
0k:upd-docker
0k:update-latest-synapse
0k:wip
5 Commits
Author | SHA1 | Message | Date |
---|---|---|---|
Valentin Lab | 26a0ea08ed |
new: [cyclos] new charm
Signed-off-by: Valentin Lab <valentin.lab@kalysto.org> |
4 years ago |
Valentin Lab | 8208188756 |
fix: [odoo-tecnativa] remove default install of ``l10n_fr``
Signed-off-by: Valentin Lab <valentin.lab@kalysto.org> |
4 years ago |
Valentin Lab | 785cf5e4dd |
fix: [postgres] proper support of ``postgis`` extension.
Signed-off-by: Valentin Lab <valentin.lab@kalysto.org> |
4 years ago |
Valentin Lab | 2497e68ac6 |
new: [dhcp] new charm
Signed-off-by: Valentin Lab <valentin.lab@kalysto.org> |
4 years ago |
Valentin Lab | 2adc8fdeaa |
fix: [host] ``dnsmasq``'s DNS waterfall didn't have proper ``logrotate`` script.
Signed-off-by: Valentin Lab <valentin.lab@kalysto.org> |
4 years ago |
10 changed files with 153 additions and 13 deletions
-
19cyclos/hooks/postgres_database-relation-joined
-
29cyclos/metadata.yml
-
12dhcp/build/Dockerfile
-
17dhcp/hooks/init
-
53dhcp/metadata.yml
-
2odoo-tecnativa/hooks/init
-
9postgres/build/Dockerfile
-
13postgres/hooks/init
-
4postgres/lib/common
-
4precise/host/hooks/install.d/80-dns-waterfall.sh
@ -0,0 +1,19 @@ |
|||
#!/bin/bash |
|||
|
|||
set -e |
|||
|
|||
PASSWORD="$(relation-get password)" |
|||
USER="$(relation-get user)" |
|||
DBNAME="$(relation-get dbname)" |
|||
|
|||
config-add "\ |
|||
services: |
|||
$MASTER_BASE_SERVICE_NAME: |
|||
environment: |
|||
DB_HOST: \"$MASTER_TARGET_SERVICE_NAME\" |
|||
DB_NAME: \"$DBNAME\" |
|||
DB_USER: \"$USER\" |
|||
DB_PASSWORD: \"$PASSWORD\" |
|||
" |
|||
|
|||
info "Configured $SERVICE_NAME code for $TARGET_SERVICE_NAME access." |
@ -0,0 +1,29 @@ |
|||
## Based on cyclos/cyclos:4.13.2 |
|||
docker-image: docker.0k.io/cyclos:4.13.2 |
|||
|
|||
default-options: |
|||
|
|||
uses: |
|||
postgres-database: |
|||
#constraint: required | recommended | optional |
|||
#auto: pair | summon | none ## default: pair |
|||
constraint: required |
|||
auto: summon |
|||
solves: |
|||
database: "main storage" |
|||
default-options: |
|||
extensions: |
|||
- cube |
|||
- earthdistance |
|||
- postgis |
|||
- unaccent |
|||
web-proxy: |
|||
#constraint: required | recommended | optional |
|||
#auto: pair | summon | none ## default: pair |
|||
constraint: recommended |
|||
auto: pair |
|||
solves: |
|||
proxy: "Public access" |
|||
default-options: |
|||
target: !var-expand ${MASTER_BASE_SERVICE_NAME}:8080 |
|||
|
@ -0,0 +1,12 @@ |
|||
FROM alpine:latest |
|||
|
|||
LABEL description="ISC DHCP Server on Alpine Linux" |
|||
|
|||
RUN apk --no-cache add dhcp |
|||
|
|||
ENTRYPOINT ["/usr/sbin/dhcpd", "-4", \ |
|||
"-d", \ |
|||
# "-cf", "/config/dhcpd.conf", \ |
|||
# "-lf", "/config/dhcpd.leases", \ |
|||
"-user", "dhcp", \ |
|||
"-group", "dhcp"] |
@ -0,0 +1,17 @@ |
|||
#!/bin/bash |
|||
|
|||
## Init is run on host |
|||
## For now it is run every time the script is launched, but |
|||
## it should be launched only once after build. |
|||
|
|||
## Accessible variables are: |
|||
## - SERVICE_NAME Name of current service |
|||
## - DOCKER_BASE_IMAGE Base image from which this service might be built if any |
|||
## - SERVICE_DATASTORE Location on host of the DATASTORE of this service |
|||
## - SERVICE_CONFIGSTORE Location on host of the CONFIGSTORE of this service |
|||
|
|||
|
|||
config=$(options-get config 2>/dev/null) || true |
|||
|
|||
mkdir -p "$SERVICE_CONFIGSTORE"/etc/dhcp && |
|||
e "$config" > "$SERVICE_CONFIGSTORE"/etc/dhcp/dhcpd.conf |
@ -0,0 +1,53 @@ |
|||
data-resources: |
|||
- /var/lib/dhcp |
|||
- /var/log/dhcp |
|||
config-resources: |
|||
- /etc/dhcp/dhcpd.conf |
|||
default-options: |
|||
# config: | |
|||
# ## Sample configuration file for ISC dhcpd |
|||
|
|||
# option domain-name "example.org"; |
|||
# option domain-name-servers ns1.example.org, ns2.example.org; |
|||
# default-lease-time 600; |
|||
# max-lease-time 7200; |
|||
# #ddns-update-style none; |
|||
# authoritative; |
|||
# log-facility local7; |
|||
|
|||
# ## No service will be given on this subnet, but declaring it allows the dhcp |
|||
# ## server to listen on this network |
|||
# subnet 172.17.0.0 netmask 255.255.255.0 { |
|||
# } |
|||
|
|||
# ## This is a very basic subnet declaration. |
|||
# subnet 10.254.239.0 netmask 255.255.255.224 { |
|||
# range 10.254.239.10 10.254.239.20; |
|||
# option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org; |
|||
# } |
|||
|
|||
# ## A slightly different configuration for an internal subnet. |
|||
# subnet 10.5.5.0 netmask 255.255.255.224 { |
|||
# range 10.5.5.26 10.5.5.30; |
|||
# option domain-name-servers ns1.internal.example.org; |
|||
# option domain-name "internal.example.org"; |
|||
# option routers 10.5.5.1; |
|||
# option broadcast-address 10.5.5.31; |
|||
# default-lease-time 600; |
|||
# max-lease-time 7200; |
|||
# } |
|||
|
|||
# ## Fixed IP addresses can also be specified for hosts. These addresses |
|||
# ## should not also be listed as being available for dynamic assignment. |
|||
# ## Hosts for which fixed IP addresses have been specified can boot using |
|||
# ## BOOTP or DHCP. Hosts for which no fixed address is specified can only |
|||
# ## be booted with DHCP, unless there is an address range on the subnet |
|||
# ## to which a BOOTP client is connected which has the dynamic-bootp flag |
|||
# ## set. |
|||
# host fantasia { |
|||
# hardware ethernet 08:00:07:26:c0:a5; |
|||
# fixed-address fantasia.example.com; |
|||
# } |
|||
docker-compose: |
|||
ports: |
|||
- 67:67/udp |
Write
Preview
Loading…
Cancel
Save
Reference in new issue