Compare commits
merge into: 0k:master
0k:0k/dev/master
0k:backup
0k:bgallet/mattermost
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
pull from: 0k:get-version
0k:0k/dev/master
0k:backup
0k:bgallet/mattermost
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
2 Commits
master
...
get-versio
Author | SHA1 | Message | Date |
---|---|---|---|
Valentin Lab | c6d6b90349 |
wip
|
1 month ago |
Valentin Lab | 3df5a148ab |
new: [bluesky] new charm
|
7 days ago |
8 changed files with 251 additions and 12 deletions
-
114bluesky/actions/create-invite-code
-
7bluesky/hooks/init
-
12bluesky/hooks/web_proxy-relation-joined
-
49bluesky/lib/common
-
30bluesky/metadata.yml
-
24nextcloud/actions/get-version
-
12nextcloud/actions/upgrade
-
15nextcloud/lib/common
@ -0,0 +1,114 @@ |
|||||
|
#!/bin/bash |
||||
|
## compose: no-hooks |
||||
|
|
||||
|
if [ -z "$SERVICE_DATASTORE" ]; then |
||||
|
echo "This script is meant to be run through 'compose' to work properly." >&2 |
||||
|
exit 1 |
||||
|
fi |
||||
|
|
||||
|
|
||||
|
. $CHARM_PATH/lib/common |
||||
|
|
||||
|
|
||||
|
version=0.1 |
||||
|
usage="$exname [-h|--help]" |
||||
|
help=" |
||||
|
USAGE: |
||||
|
|
||||
|
$usage |
||||
|
|
||||
|
DESCRIPTION: |
||||
|
|
||||
|
Request an invite code. |
||||
|
|
||||
|
EXAMPLES: |
||||
|
|
||||
|
$exname |
||||
|
|
||||
|
" |
||||
|
|
||||
|
|
||||
|
dbname= |
||||
|
neutralize= |
||||
|
while [ "$1" ]; do |
||||
|
case "$1" in |
||||
|
"--help"|"-h") |
||||
|
print_help >&2 |
||||
|
exit 0 |
||||
|
;; |
||||
|
--*|-*) |
||||
|
err "Unexpected optional argument '$1'" |
||||
|
print_usage >&2 |
||||
|
exit 1 |
||||
|
;; |
||||
|
*) |
||||
|
err "Unexpected positional argument '$1'" |
||||
|
print_usage >&2 |
||||
|
exit 1 |
||||
|
;; |
||||
|
esac |
||||
|
shift |
||||
|
done |
||||
|
|
||||
|
|
||||
|
set -e |
||||
|
|
||||
|
. "$PDS_ENV_FILE" |
||||
|
|
||||
|
|
||||
|
curl_opts=() |
||||
|
|
||||
|
service_def=$(get_compose_service_def "$SERVICE_NAME") |
||||
|
|
||||
|
containers="$(get_running_containers_for_service "$SERVICE_NAME")" |
||||
|
if [ -z "$containers" ]; then |
||||
|
err "No containers running for service $DARKYELLOW$SERVICE_NAME$NORMAL." |
||||
|
exit 1 |
||||
|
fi |
||||
|
|
||||
|
if [ "$(echo "$containers" | wc -l)" -gt 1 ]; then |
||||
|
err "More than 1 container running for service $DARKYELLOW$SERVICE_NAME$NORMAL." |
||||
|
echo " Please contact administrator to fix this issue." >&2 |
||||
|
exit 1 |
||||
|
fi |
||||
|
|
||||
|
container="$(echo "$containers" | head -n 1)" |
||||
|
|
||||
|
container_network_ip=$(get_healthy_container_ip_for_service "$SERVICE_NAME" 3000 4) || { |
||||
|
err "Please ensure that $DARKYELLOW$service$NORMAL is running before using '$exname'." |
||||
|
exit 1 |
||||
|
} |
||||
|
|
||||
|
container_ip=${container_network_ip##*:} |
||||
|
container_network=${container_network_ip%%:*} |
||||
|
|
||||
|
|
||||
|
DEFAULT_CURL_IMAGE=${DEFAULT_CURL_IMAGE:-docker.0k.io/curl} |
||||
|
|
||||
|
cmd=( |
||||
|
docker run -i --rm --network "$container_network" |
||||
|
"$DEFAULT_CURL_IMAGE" |
||||
|
--fail \ |
||||
|
--silent \ |
||||
|
--show-error \ |
||||
|
--request POST \ |
||||
|
--user "admin:${PDS_ADMIN_PASSWORD}" \ |
||||
|
--header "Content-Type: application/json" \ |
||||
|
--data '{"useCount": 1}' \ |
||||
|
"http://${container_ip}:3000/xrpc/com.atproto.server.createInviteCode" |
||||
|
) |
||||
|
|
||||
|
## XXXvlab: contains password, left only for advanced debug |
||||
|
#echo "COMMAND: ${cmd[@]}" >&2 |
||||
|
|
||||
|
if ! out=$("${cmd[@]}"); then |
||||
|
err "Failed to request an invite code." |
||||
|
echo " $out" | prefix " $GRAY|$NORMAL " >&2 |
||||
|
exit 1 |
||||
|
fi |
||||
|
|
||||
|
e "$out" | jq -r '.code' || { |
||||
|
err "Failed to parse invite code from response." |
||||
|
echo " $out" | prefix " $GRAY|$NORMAL " >&2 |
||||
|
exit 1 |
||||
|
} |
@ -0,0 +1,7 @@ |
|||||
|
#!/bin/bash |
||||
|
|
||||
|
. lib/common |
||||
|
|
||||
|
set -e |
||||
|
|
||||
|
bluesky:init |
@ -0,0 +1,12 @@ |
|||||
|
#!/bin/bash |
||||
|
|
||||
|
set -e |
||||
|
|
||||
|
DOMAIN=$(relation-get domain) || exit 1 |
||||
|
|
||||
|
config-add "\ |
||||
|
services: |
||||
|
$MASTER_BASE_SERVICE_NAME: |
||||
|
environment: |
||||
|
PDS_HOSTNAME: $DOMAIN |
||||
|
" |
@ -0,0 +1,49 @@ |
|||||
|
# -*- mode: shell-script -*- |
||||
|
|
||||
|
PDS_LOCAL_DATADIR=/var/lib/bluesky |
||||
|
PDS_DATADIR="$SERVICE_DATASTORE$PDS_LOCAL_DATADIR" |
||||
|
PDS_ENV_FILE="$PDS_DATADIR/.env" |
||||
|
|
||||
|
|
||||
|
bluesky:init() { |
||||
|
init-config-add " |
||||
|
$SERVICE_NAME: |
||||
|
env_file: |
||||
|
- \"$PDS_ENV_FILE\" |
||||
|
" |
||||
|
|
||||
|
[ -e "$PDS_ENV_FILE" ] && return |
||||
|
|
||||
|
local admin_password=$(password:get admin internal) || { |
||||
|
echo "Failed to get admin password" >&2 |
||||
|
return 1 |
||||
|
} |
||||
|
mkdir -p "${PDS_ENV_FILE%/*}" |
||||
|
cat > "$PDS_ENV_FILE" <<EOF |
||||
|
PDS_JWT_SECRET=$(openssl rand -hex 16) |
||||
|
PDS_ADMIN_PASSWORD=${admin_password} |
||||
|
PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX=$( |
||||
|
openssl ecparam --name secp256k1 --genkey --noout --outform DER | |
||||
|
tail --bytes=+8 | |
||||
|
head --bytes=32 | |
||||
|
xxd --plain --cols 32 |
||||
|
) |
||||
|
|
||||
|
PDS_DATA_DIRECTORY=${PDS_LOCAL_DATADIR} |
||||
|
PDS_BLOBSTORE_DISK_LOCATION=${PDS_LOCAL_DATADIR}/blocks |
||||
|
PDS_BLOB_UPLOAD_LIMIT=52428800 |
||||
|
|
||||
|
PDS_DID_PLC_URL=https://plc.directory |
||||
|
|
||||
|
PDS_BSKY_APP_VIEW_URL=https://api.bsky.app |
||||
|
PDS_BSKY_APP_VIEW_DID=did:web:api.bsky.app |
||||
|
|
||||
|
PDS_REPORT_SERVICE_URL=https://mod.bsky.app |
||||
|
PDS_REPORT_SERVICE_DID=did:plc:ar7c4by46qjdydhdevvrndac |
||||
|
|
||||
|
PDS_CRAWLERS=https://bsky.network |
||||
|
|
||||
|
LOG_ENABLED=true |
||||
|
EOF |
||||
|
|
||||
|
} |
@ -0,0 +1,30 @@ |
|||||
|
docker-image: docker.0k.io/bluesky:0.4.67 ## from: ghcr.io/bluesky-social/pds:0.4.67 |
||||
|
data-resources: |
||||
|
- /var/lib/bluesky |
||||
|
|
||||
|
default-options: |
||||
|
|
||||
|
uses: |
||||
|
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}:3000 |
||||
|
backup: |
||||
|
constraint: recommended |
||||
|
auto: pair |
||||
|
solves: |
||||
|
backup: "Automatic regular backup" |
||||
|
default-options: |
||||
|
## First pattern matching wins, no pattern matching includes. |
||||
|
## include-patterns are checked first, then exclude-patterns |
||||
|
## Patterns rules: |
||||
|
## - ending / for directory |
||||
|
## - '*' authorized |
||||
|
## - must start with a '/', will start from $SERVICE_DATASTORE |
||||
|
#exclude-patterns: |
||||
|
# - "/var/lib/odoo/sessions/" |
@ -0,0 +1,24 @@ |
|||||
|
#!/bin/bash |
||||
|
# compose: no-hooks |
||||
|
|
||||
|
. $CHARM_PATH/lib/common |
||||
|
|
||||
|
|
||||
|
|
||||
|
|
||||
|
image_version=${DOCKER_BASE_IMAGE##*:} ## retrieve tag |
||||
|
image_version=${image_version%%-*} ## remove suffix |
||||
|
|
||||
|
version=$(nextcloud:config:version) || { |
||||
|
err "Failed to retrieve version" |
||||
|
exit 1 |
||||
|
} |
||||
|
|
||||
|
version=${version:-N/A} ## remove suffix |
||||
|
|
||||
|
msg=() |
||||
|
if [ "$version" != "$image_version" ]; then |
||||
|
msg+=("image version mismatch ($image_version)") |
||||
|
fi |
||||
|
|
||||
|
printf "%s\n" "$version" "${msg[@]}" |
Write
Preview
Loading…
Cancel
Save
Reference in new issue