diff options
| -rw-r--r-- | dan/ele-media.yml | 2 | ||||
| -rw-r--r-- | dan/host_vars/ele-media.yml | 34 | ||||
| -rw-r--r-- | inventory/host_vars/ele-gwhetzner.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/ele-media.yml | 9 | ||||
| -rw-r--r-- | inventory/host_vars/ele-router-hmtsaal.yml | 2 | ||||
| -rw-r--r-- | inventory/host_vars/sk-cloudio/collabora.yml | 2 | ||||
| -rw-r--r-- | inventory/hosts.ini | 2 | ||||
| -rw-r--r-- | roles/elevate/media/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/elevate/media/tasks/nextcloud-app.yml | 9 |
9 files changed, 31 insertions, 33 deletions
diff --git a/dan/ele-media.yml b/dan/ele-media.yml index cf90b2f6..a289cd3b 100644 --- a/dan/ele-media.yml +++ b/dan/ele-media.yml @@ -21,5 +21,5 @@ - role: network/wireguard/gateway - role: x509/acmetool/base - role: nginx/base - - role: monitoring/prometheus/exporter +# - role: monitoring/prometheus/exporter - role: elevate/media diff --git a/dan/host_vars/ele-media.yml b/dan/host_vars/ele-media.yml index aeac86fa..be3605aa 100644 --- a/dan/host_vars/ele-media.yml +++ b/dan/host_vars/ele-media.yml @@ -1,18 +1,18 @@ $ANSIBLE_VAULT;1.2;AES256;dan -36343363323363636564616363643262656666363435303866313833323437373364313837393532 -3931363533343038343638353332316164666332646265350a396235313932346365666132616566 -63663335376334626263366334376236326436663565626236643166356336613332613332323532 -3038393037653863380a633462323563303937316234383565326233356330333662326634336630 -66653130616433643837393639656264643037656236353039653761343136313135316566663362 -36336233393562646361623439316435363263376261373835306136393435343634396233383437 -37396636333865633865313561303736396365373061316332386536353061363366313637656534 -34633435383039363232313131316561313432303830383231323536643536316265303065653537 -34356366366263393064396438643531306233306466303833656139323836313461373962663333 -64323036626330326131626565323966386530623439356238663665313830626532336562303933 -61333231313166306362623463633064366237363133323264616166303365663963303132343837 -35333734653433633036393238343333373961326536333866626432343534366233643438666430 -62333131353364326536636466626165383961306665353537346335316631356539346262303039 -61323636303039353239626132616632643834613064373533373730663962663764613037303862 -62346531643133346130343630353933383364666531336162386162383565383063303633616361 -63633937636461343336346234656461393336636363386463303764383030316663643236313334 -3833 +32383030626365353437666338353362653263373234613333386537333465366536396533343739 +6165663837376238636161386162373666313135376264370a346166363462323831346237393266 +64666238656632323331356230363331316534626437326538636433336239626164616665383864 +3064333035656334300a306535623632666566636631666339396435346435663064613463306366 +66326436333364303434623132643063666137366461613634353335666164376231303462633233 +65653532613761636537646439623338663338373364323531383936373765356436306265366465 +32636465323237623562356262356238363263383837386565393565366433376236366363623838 +30356336393139333561633863386431343731306331313137363731366335373435643866316332 +36323666376135313538663334663338313364313638666165333439666365373264656465363461 +38303262323237363733313633636131353661643433393530656232396363373664323639646635 +32303836386532353335363835376439363532333830343237346437346639636530333831356637 +35663335376435653839346166336465396462323231396235623762373032363064383662613764 +38653230623061333533373033373137393132366362343438346163393062663137653532633338 +65643430386466616366333164396637633764613938313232613631616535653366346135663865 +35643931666363616566356435303665386663656562373862646538326265373430656630343363 +37636432343561323737383538386563316234323438303563613537616565336239663439363936 +3231 diff --git a/inventory/host_vars/ele-gwhetzner.yml b/inventory/host_vars/ele-gwhetzner.yml index d3faf0cf..ea16146e 100644 --- a/inventory/host_vars/ele-gwhetzner.yml +++ b/inventory/host_vars/ele-gwhetzner.yml @@ -42,7 +42,7 @@ wireguard_keys: wireguard_gateway_tunnels: wg-elemedia: - description: Elevate Media Server (media.elevate.at) + description: Elevate Media Server (media.elev8.at) priv_key: "{{ wireguard_keys.elemedia.priv }}" addresses: - 192.168.254.1/30 diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml index 7966a422..8ad5a630 100644 --- a/inventory/host_vars/ele-media.yml +++ b/inventory/host_vars/ele-media.yml @@ -132,20 +132,19 @@ elevate_media_nextcloud_storage: size: 150G fs: ext4 -elevate_media_nextcloud_instance_name: media.elevate.at +elevate_media_nextcloud_instance_name: media.elev8.at elevate_media_nextcloud_instance: - version: 26.0.3 + version: 27.1.2 port: 8100 hostnames: - - media.elevate.at - media.elev8.at admin: username: admin - password: "{{ vault_nextcloud_admin_passwords['media.elevate.at'] }}" + password: "{{ vault_nextcloud_admin_passwords['media.elev8.at'] }}" database: type: mariadb version: 10.11.4 - password: "{{ vault_nextcloud_database_passwords['media.elevate.at'] }}" + password: "{{ vault_nextcloud_database_passwords['media.elev8.at'] }}" elevate_media_nextcloud_memory_limit: 4G elevate_media_nextcloud_max_upload_size: 20G diff --git a/inventory/host_vars/ele-router-hmtsaal.yml b/inventory/host_vars/ele-router-hmtsaal.yml index ffb76272..9bb96ed3 100644 --- a/inventory/host_vars/ele-router-hmtsaal.yml +++ b/inventory/host_vars/ele-router-hmtsaal.yml @@ -165,7 +165,7 @@ openwrt_mixin: /etc/hosts.extra: content: | - {{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets['ele-media']) | ansible.utils.ipaddr('address') }} media.elevate.at + {{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets['ele-media']) | ansible.utils.ipaddr('address') }} media.elev8.at /etc/hotplug.d/openvpn/10-mgmt: content: | diff --git a/inventory/host_vars/sk-cloudio/collabora.yml b/inventory/host_vars/sk-cloudio/collabora.yml index 849281bf..2632916e 100644 --- a/inventory/host_vars/sk-cloudio/collabora.yml +++ b/inventory/host_vars/sk-cloudio/collabora.yml @@ -18,4 +18,4 @@ collabora_code_instances: - wae.elevate.at - wolke.elev8.at - cloud.transitiongraz.org - - media.elevate.at + - media.elev8.at diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 4cd084d2..f7d0ec34 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -204,7 +204,7 @@ sk-torrent host_name=torrent [elevate:vars] -host_domain=elevate.at +host_domain=elev8.at env_group=dan [elevate] diff --git a/roles/elevate/media/defaults/main.yml b/roles/elevate/media/defaults/main.yml index d5a496c1..7ce94480 100644 --- a/roles/elevate/media/defaults/main.yml +++ b/roles/elevate/media/defaults/main.yml @@ -10,7 +10,7 @@ elevate_media_nextcloud_db_gid: "801" # elevate_media_nextcloud_storage: # ... -# elevate_media_nextcloud_instance_name: media.elevate.at +# elevate_media_nextcloud_instance_name: media.elev8.at # elevate_media_nextcloud_instance: # ... diff --git a/roles/elevate/media/tasks/nextcloud-app.yml b/roles/elevate/media/tasks/nextcloud-app.yml index 42a351e4..b4047f62 100644 --- a/roles/elevate/media/tasks/nextcloud-app.yml +++ b/roles/elevate/media/tasks/nextcloud-app.yml @@ -154,8 +154,7 @@ register: nextcloud_installer_output ### TODO: call these commands -## nextcloud-occ media.elevate.at config:system:set trusted_domains 0 --value='media.elevate.at' -## nextcloud-occ media.elevate.at config:system:set trusted_domains 1 --value='media.elev8.at' -## nextcloud-occ media.elevate.at config:system:set overwriteprotocol --value='https' -## nextcloud-occ media.elevate.at config:system:set overwrite.cli.url --value='https://media.elevate.at' -## nextcloud-occ media.elevate.at config:system:set default_phone_region --value='at' +## nextcloud-occ media.elev8.at config:system:set trusted_domains 0 --value='media.elev8.at' +## nextcloud-occ media.elev8.at config:system:set overwriteprotocol --value='https' +## nextcloud-occ media.elev8.at config:system:set overwrite.cli.url --value='https://media.elev8.at' +## nextcloud-occ media.elev8.at config:system:set default_phone_region --value='at' |