From c1739ba1f049189d3f6227cf5ccba1d26997823c Mon Sep 17 00:00:00 2001 From: "Max F. Albrecht" <1@178.is> Date: Wed, 11 Jan 2017 21:44:51 +0100 Subject: [PATCH 01/66] README: quickstart --- README.md | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index abc44fe..172770d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,29 @@ -# madek-instance +# Madek hosting template -## config +This is a template to set up a [Madek](https://zhdk.ch/madek) server, +providing a web-based media archive. -- global config in `group_vars/madek.yml` -- per-host config in `host_vars/madek.example.com.yml` +## quickstart + +1. ["Fork" this repository on github](https://github.com/Madek/madek-instance/fork) + *(only required if you want to receive update notifications)* + +1. clone it to a computer running Linux or macOS: `git clone git@github:yourUserName/madek-instance my-madek` + +1. setup: + ```sh + which ansible-playbook || echo "install ansible first!" + cd my-madek + git submodule update --init Madek + cd Madek && git reset --hard origin/release && git submodule update --init --recursive deploy + ``` + +1. prepare a server running [Debian `jessie`](https://www.debian.org/releases/jessie/), + log in as root via SSH and do `apt-get install python` + +1. configure + - fill in hostname in file `hosts` + - global config in file `group_vars/madek.yml` + - per-host config in file `host_vars/madek.example.com.yml`, rename it to match the hostname + +1. install `ansible-playbook -i hosts Madek/deploy/play_setup-and-deploy.yml` From 8792e5000dfc548cc47d9baa7d720e1efbfa0bfb Mon Sep 17 00:00:00 2001 From: "Max F. Albrecht" <1@178.is> Date: Wed, 11 Jan 2017 22:01:38 +0100 Subject: [PATCH 02/66] git: ignore secret --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..788ac02 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +# ignore the secret +master_secret.txt From 5128677fde926b34c6dc1890d87e34e063e3adfa Mon Sep 17 00:00:00 2001 From: "Max F. Albrecht" <1@178.is> Date: Wed, 11 Jan 2017 22:54:52 +0100 Subject: [PATCH 03/66] move guide out of README MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ideally the README shouldn’t change so forks that edited theirs don’t get merge conflicts --- GUIDE.md | 24 ++++++++++++++++++++++++ README.md | 25 +------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 GUIDE.md diff --git a/GUIDE.md b/GUIDE.md new file mode 100644 index 0000000..78c4562 --- /dev/null +++ b/GUIDE.md @@ -0,0 +1,24 @@ +## quickstart + +1. ["Fork" this repository on github](https://github.com/Madek/madek-instance/fork) + *(only required if you want to receive update notifications)* + +1. clone it to a computer running Linux or macOS: `git clone git@github:yourUserName/madek-instance my-madek` + +1. setup: + ```sh + which ansible-playbook || echo "install ansible first!" + cd my-madek + git submodule update --init Madek + cd Madek && git reset --hard origin/release && git submodule update --init --recursive deploy && cd - + ``` + +1. prepare a server running [Debian `jessie`](https://www.debian.org/releases/jessie/), + log in as root via SSH and do `apt-get install python` + +1. configure + - fill in hostname in file `hosts` + - global config in file `group_vars/madek.yml` + - per-host config in file `host_vars/madek.example.com.yml`, rename it to match the hostname + +1. install `ansible-playbook -i hosts Madek/deploy/play_setup-and-deploy.yml` diff --git a/README.md b/README.md index 172770d..23f8672 100644 --- a/README.md +++ b/README.md @@ -3,27 +3,4 @@ This is a template to set up a [Madek](https://zhdk.ch/madek) server, providing a web-based media archive. -## quickstart - -1. ["Fork" this repository on github](https://github.com/Madek/madek-instance/fork) - *(only required if you want to receive update notifications)* - -1. clone it to a computer running Linux or macOS: `git clone git@github:yourUserName/madek-instance my-madek` - -1. setup: - ```sh - which ansible-playbook || echo "install ansible first!" - cd my-madek - git submodule update --init Madek - cd Madek && git reset --hard origin/release && git submodule update --init --recursive deploy - ``` - -1. prepare a server running [Debian `jessie`](https://www.debian.org/releases/jessie/), - log in as root via SSH and do `apt-get install python` - -1. configure - - fill in hostname in file `hosts` - - global config in file `group_vars/madek.yml` - - per-host config in file `host_vars/madek.example.com.yml`, rename it to match the hostname - -1. install `ansible-playbook -i hosts Madek/deploy/play_setup-and-deploy.yml` +## [quickstart - read this](https://github.com/Madek/madek-instance/blob/master/GUIDE.md) From 01d128ba171fb83d93773d79aa24b7aa7418db22 Mon Sep 17 00:00:00 2001 From: Max Albrecht <1@178.is> Date: Tue, 17 Jan 2017 14:06:30 +0100 Subject: [PATCH 04/66] Update GUIDE.md --- GUIDE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/GUIDE.md b/GUIDE.md index 78c4562..160fceb 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -22,3 +22,5 @@ - per-host config in file `host_vars/madek.example.com.yml`, rename it to match the hostname 1. install `ansible-playbook -i hosts Madek/deploy/play_setup-and-deploy.yml` + +1. (setup admin account) From 608953f102e289182afe40e36a078a3e29d17648 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Wed, 25 Jan 2017 13:50:23 +0100 Subject: [PATCH 05/66] GUIDE: install, backup, upgrade --- GUIDE.md | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/GUIDE.md b/GUIDE.md index 160fceb..78e9213 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -1,3 +1,5 @@ +# Madek Hosting Guide + ## quickstart 1. ["Fork" this repository on github](https://github.com/Madek/madek-instance/fork) @@ -21,6 +23,30 @@ - global config in file `group_vars/madek.yml` - per-host config in file `host_vars/madek.example.com.yml`, rename it to match the hostname -1. install `ansible-playbook -i hosts Madek/deploy/play_setup-and-deploy.yml` +1. install with ansible + ```sh + ansible-playbook -i hosts Madek/deploy/play_setup-and-deploy.yml + ``` + +1. setup initial configuration & admin account: + ```sh + ansible-playbook -i hosts Madek/deploy/play_first-time-setup.yml + ``` + +## backup + +A `master_secret` was created during the installation and put in a text file +in your repository. +By default it is git-ignored, so it won't be accidentially pushed to a public +host (like GitHub). +You should either back up your local repository to a secure place; +or use [`git-crypt`](https://www.agwa.name/projects/git-crypt/) to add the +secret to the repository in encrypted form (*recommended*). + +## upgrade + +1. update Madek submodule reference to latest release + - either by accepting a Pull Request (when enabled) + - or manually: `cd Madek && git fetch && git reset --hard origin/release && cd -` -1. (setup admin account) +1. run the setup playbook again: `ansible-playbook -i hosts Madek/deploy/play_setup-and-deploy.yml` From 7b7bf9eb4d69a15c21503043235088b549d055b7 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Wed, 25 Jan 2017 13:56:25 +0100 Subject: [PATCH 06/66] [update] Madek v3.0.0-7.5 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 349723c..31b34fd 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 349723c40638b9aea4746dd3e9f88880277a331c +Subproject commit 31b34fd2aae62c9600f38f970db860749132359b From 50eafb8278edf31aa60cf1c0e131bd38b89f066d Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Fri, 27 Jan 2017 12:03:16 +0100 Subject: [PATCH 07/66] enhance Guide: installation, config, upgrades move examples into a folder add upgrade script --- GUIDE.md | 49 +++++++++++++------ README.md | 2 +- .../host_vars_example.yml | 6 ++- examples/hosts_example | 2 + group_vars/madek.yml | 4 -- host_vars/.gitkeep | 0 hosts | 2 - scripts/update_madek_latest | 8 +++ 8 files changed, 50 insertions(+), 23 deletions(-) rename host_vars/madek.example.com.yml => examples/host_vars_example.yml (70%) create mode 100755 examples/hosts_example create mode 100644 host_vars/.gitkeep delete mode 100644 hosts create mode 100755 scripts/update_madek_latest diff --git a/GUIDE.md b/GUIDE.md index 78e9213..d69f4b1 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -1,15 +1,14 @@ # Madek Hosting Guide -## quickstart +## setup & install 1. ["Fork" this repository on github](https://github.com/Madek/madek-instance/fork) - *(only required if you want to receive update notifications)* + *(only required if you want to receive updates as Pull Requests)* -1. clone it to a computer running Linux or macOS: `git clone git@github:yourUserName/madek-instance my-madek` - -1. setup: +1. set up inventory on a computer running Linux or macOS (will be the "control machine") ```sh which ansible-playbook || echo "install ansible first!" + git clone git@github:yourUserName/madek-instance my-madek cd my-madek git submodule update --init Madek cd Madek && git reset --hard origin/release && git submodule update --init --recursive deploy && cd - @@ -18,35 +17,57 @@ 1. prepare a server running [Debian `jessie`](https://www.debian.org/releases/jessie/), log in as root via SSH and do `apt-get install python` -1. configure - - fill in hostname in file `hosts` - - global config in file `group_vars/madek.yml` - - per-host config in file `host_vars/madek.example.com.yml`, rename it to match the hostname +1. inventory configuration + - prepare inventory files + ``` + # set hostname + export MADEK_HOSTNAME="madek.example.com" + # create hosts file + sh -c "echo \"$(cat examples/hosts_example)\"" > hosts + # create host_vars + sh -c "echo \"$(cat examples/host_vars_example.yml)\"" > "host_vars/${MADEK_HOSTNAME}.yml" + ``` + - edit global config in file `group_vars/madek.yml` + - edit per-host config in file `host_vars/madek.example.com.yml` 1. install with ansible ```sh ansible-playbook -i hosts Madek/deploy/play_setup-and-deploy.yml ``` -1. setup initial configuration & admin account: +1. setup initial configuration & admin account (choose a better password and save it): ```sh - ansible-playbook -i hosts Madek/deploy/play_first-time-setup.yml + ansible-playbook -i hosts Madek/deploy/play_first-time-setup.yml -e "admin_password=supersecret" ``` +1. Log in as the admin user and go to the admin interface. + Change the password to a stronger one, customize the name of the instance and other settings. + Add Users and Groups and start using Madek! 🎉 + ## backup A `master_secret` was created during the installation and put in a text file in your repository. By default it is git-ignored, so it won't be accidentially pushed to a public host (like GitHub). -You should either back up your local repository to a secure place; +You should either back up your local repository with the secret to a secure place; or use [`git-crypt`](https://www.agwa.name/projects/git-crypt/) to add the secret to the repository in encrypted form (*recommended*). ## upgrade -1. update Madek submodule reference to latest release +1. update `Madek` submodule reference to latest release - either by accepting a Pull Request (when enabled) - - or manually: `cd Madek && git fetch && git reset --hard origin/release && cd -` + - or manually: `./scripts/update_madek_latest release` 1. run the setup playbook again: `ansible-playbook -i hosts Madek/deploy/play_setup-and-deploy.yml` + +## automatic deployments + +Prerequisite: All changed files (configuration etc) must be commited back into the repository, +so that it can be shared with other computers. +Note that you can use this fork normally, with one caveat: +**don't edit any files that came with this repository**, or you will have to deal with merge conflicts later on! +The only exception is `README.md`, we won't touch it because you'll likely want to customize it. + +# git-crypt diff --git a/README.md b/README.md index 23f8672..8ec7d30 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ This is a template to set up a [Madek](https://zhdk.ch/madek) server, providing a web-based media archive. -## [quickstart - read this](https://github.com/Madek/madek-instance/blob/master/GUIDE.md) +## [Read the Guide](https://github.com/Madek/madek-instance/blob/master/GUIDE.md) diff --git a/host_vars/madek.example.com.yml b/examples/host_vars_example.yml similarity index 70% rename from host_vars/madek.example.com.yml rename to examples/host_vars_example.yml index 886f794..981e8b3 100644 --- a/host_vars/madek.example.com.yml +++ b/examples/host_vars_example.yml @@ -1,6 +1,8 @@ +--- # connection -# ansible_ssh_host: madek.example.com -# madek_external_hostname: madek.example.com +ansible_ssh_host: ${MADEK_HOSTNAME} +madek_external_hostname: ${MADEK_HOSTNAME} +ansible_ssh_port: 22 ansible_ssh_user: root # storage diff --git a/examples/hosts_example b/examples/hosts_example new file mode 100755 index 0000000..bbf05ed --- /dev/null +++ b/examples/hosts_example @@ -0,0 +1,2 @@ +[madek] +${MADEK_HOSTNAME} diff --git a/group_vars/madek.yml b/group_vars/madek.yml index aee6a57..84bf3fc 100644 --- a/group_vars/madek.yml +++ b/group_vars/madek.yml @@ -6,10 +6,6 @@ zencoder_enabled: false # backups # db_backups_enabled: False -# branding -madek_site_title: "Media Archive" -madek_welcome_title: "Welcome to Madek!" - # madek_webapp_html_extra_head_start: | # + +# madek_webapp_html_extra_head_end: | +# diff --git a/group_vars/madek.yml b/group_vars/madek.yml deleted file mode 100644 index 84bf3fc..0000000 --- a/group_vars/madek.yml +++ /dev/null @@ -1,24 +0,0 @@ -# audio and videos previews -zencoder_enabled: false -# zencoder_api_key: '{{zhdk_zencoder_api_key}}' -# zencoder_test_mode: True - -# backups -# db_backups_enabled: False - -# madek_webapp_html_extra_head_start: | -# - -# madek_webapp_html_extra_head_end: | -# From 9cd060737a7e0542f8d385a6af28cd82bdae4b8a Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Fri, 27 Jan 2017 12:20:14 +0100 Subject: [PATCH 09/66] add Cider-CI example config --- examples/cider-ci.yml | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 examples/cider-ci.yml diff --git a/examples/cider-ci.yml b/examples/cider-ci.yml new file mode 100644 index 0000000..dba6718 --- /dev/null +++ b/examples/cider-ci.yml @@ -0,0 +1,43 @@ +# working example configuration to deploy a madek instance using Cider-CI + +jobs: + deploy_madek: + name: Deploy Madek + + context: + task_defaults: + max_trials: 1 + git_options: {submodules: {include_match: ^.*$}} + aggregate_state: satisfy-last + traits: + Ansible 2: yes + git-crypt: yes + ci-executor.madek: yes + + environment_variables: + LANG: "en_US.UTF-8" + + tasks: + deploy: + exclusive_global_resources: + "madek.example.com": true + environment_variables: + HOSTS_FILE: hosts + + scripts: + deploy: + start_when: + git-crypt is unlocked: {script_key: unlock} + only when we are on the head of master branch: {script_key: check-head-of-master} + + timeout: 30 minutes + body: cd Madek/deploy && ansible-playbook -i "../../${HOSTS_FILE}" play_setup-and-deploy.yml + + check-head-of-master: + body: | + set -eux + git fetch --all + [[ $(git log -n 1 --pretty=%H HEAD -- ) == $(git log -n 1 --pretty=%H origin/master -- ) ]] + + unlock: + body: git crypt unlock && ls -R group_vars From 0fac5d09e2b260efd96162000b6e92a19e69c46a Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Fri, 27 Jan 2017 17:03:40 +0100 Subject: [PATCH 10/66] add git-crypt usage and examples --- GUIDE.md | 27 ++++++++++++++++++++++++--- examples/git-crypt/.gitattributes | 1 + examples/git-crypt/.gitignore | 2 ++ 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 examples/git-crypt/.gitattributes create mode 100644 examples/git-crypt/.gitignore diff --git a/GUIDE.md b/GUIDE.md index d69f4b1..fb00493 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -64,10 +64,31 @@ secret to the repository in encrypted form (*recommended*). ## automatic deployments -Prerequisite: All changed files (configuration etc) must be commited back into the repository, +***Prerequisite:*** All changed files (configuration etc) must be committed back into the repository, so that it can be shared with other computers. -Note that you can use this fork normally, with one caveat: +That means `git-crypt` must be set up (see below). + +*Note* that you can use this fork normally, with one caveat: **don't edit any files that came with this repository**, or you will have to deal with merge conflicts later on! The only exception is `README.md`, we won't touch it because you'll likely want to customize it. -# git-crypt +1. add GPG of your trusted CI machine to the repo: + ``` + git crypt add-gpg-user ${CI_GPG_KEY_ID} + ``` + +1. add SSH public key of CI executor to `authorized_keys` of target server + +1. set up your CI to `git crypt unlock` und run the deploy script. + See `examples/cider-ci.yml` for a working [Cider-CI](https://cider-ci.info) configuration. + +## git-crypt + +``` +which git-crypt || echo 'install `git-crypt` first!' +cp examples/git-crypt/.git{ignore,attributes} . +git commit .gitignore .gitattributes -m 'setup git-crypt' +git crypt init +git crypt add-gpg-user you@example.com +git commit master_secret.txt -m 'add encrypted secret' +``` diff --git a/examples/git-crypt/.gitattributes b/examples/git-crypt/.gitattributes new file mode 100644 index 0000000..d17db48 --- /dev/null +++ b/examples/git-crypt/.gitattributes @@ -0,0 +1 @@ +*secret* filter=git-crypt diff=git-crypt diff --git a/examples/git-crypt/.gitignore b/examples/git-crypt/.gitignore new file mode 100644 index 0000000..6de15c4 --- /dev/null +++ b/examples/git-crypt/.gitignore @@ -0,0 +1,2 @@ +# DONT ignore the secret - its encrypt with git-crypt! +!master_secret.txt From f85ed7f3fc26836b1fa6e0b789b21663c79184f0 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Fri, 27 Jan 2017 12:03:30 +0100 Subject: [PATCH 11/66] [Madek] upgrade to latest development version --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 31b34fd..bd6e0b5 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 31b34fd2aae62c9600f38f970db860749132359b +Subproject commit bd6e0b5b6bcdf7b13c068a4585d22929bc28bd3e From d152d85dc286bb93e188edcdd5af44000db80879 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Fri, 27 Jan 2017 17:30:12 +0100 Subject: [PATCH 12/66] examples: cider-ci: checkout submodules its faster because we don't need everything --- examples/cider-ci.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/examples/cider-ci.yml b/examples/cider-ci.yml index dba6718..60eba44 100644 --- a/examples/cider-ci.yml +++ b/examples/cider-ci.yml @@ -7,7 +7,6 @@ jobs: context: task_defaults: max_trials: 1 - git_options: {submodules: {include_match: ^.*$}} aggregate_state: satisfy-last traits: Ansible 2: yes @@ -27,17 +26,19 @@ jobs: scripts: deploy: start_when: + submodules are checked out: {script_key: checkout-submodules} git-crypt is unlocked: {script_key: unlock} only when we are on the head of master branch: {script_key: check-head-of-master} timeout: 30 minutes body: cd Madek/deploy && ansible-playbook -i "../../${HOSTS_FILE}" play_setup-and-deploy.yml + unlock: + body: git crypt unlock && ls -la . && ls -R group_vars + check-head-of-master: - body: | - set -eux - git fetch --all - [[ $(git log -n 1 --pretty=%H HEAD -- ) == $(git log -n 1 --pretty=%H origin/master -- ) ]] + body: git fetch && test $(git log -n 1 --pretty=%H HEAD -- ) == $(git log -n 1 --pretty=%H origin/master -- ) - unlock: - body: git crypt unlock && ls -R group_vars + checkout-submodules: + start_when: {after: {script_key: check-head-of-master}} + body: git submodule update --init Madek && cd Madek && git submodule update --init --recursive deploy From cb096dd865fa8cd5690c56e9be3d380d3ac7113e Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Fri, 27 Jan 2017 17:30:22 +0100 Subject: [PATCH 13/66] examples: fix typo --- examples/git-crypt/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/git-crypt/.gitignore b/examples/git-crypt/.gitignore index 6de15c4..ced161b 100644 --- a/examples/git-crypt/.gitignore +++ b/examples/git-crypt/.gitignore @@ -1,2 +1,2 @@ -# DONT ignore the secret - its encrypt with git-crypt! +# DONT ignore the secret - its encrypted with git-crypt! !master_secret.txt From fd31326ca5f1724b407e1ebcfe545ff5072b6cd8 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Fri, 27 Jan 2017 17:57:35 +0100 Subject: [PATCH 14/66] guide: add more documentation links --- GUIDE.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/GUIDE.md b/GUIDE.md index fb00493..1cfb662 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -1,5 +1,10 @@ # Madek Hosting Guide +*For more details, see [Madek-Deploy Project](https://github.com/Madek/madek-deploy) +and the [general Madek Documentation](https://madek.readthedocs.io/)* + +--- + ## setup & install 1. ["Fork" this repository on github](https://github.com/Madek/madek-instance/fork) From 05dbe0408ac10af0b3f177570f584d28f9a95c8a Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Sat, 28 Jan 2017 15:06:40 +0100 Subject: [PATCH 15/66] guide/examples: git-crypt, fixes --- GUIDE.md | 21 +++++++++++++++++---- examples/git-crypt/group_vars_example.yml | 3 +++ examples/git-crypt/hosts_example | 5 +++++ examples/host_vars_example.yml | 13 +------------ 4 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 examples/git-crypt/group_vars_example.yml create mode 100644 examples/git-crypt/hosts_example diff --git a/GUIDE.md b/GUIDE.md index 1cfb662..c82ef53 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -15,8 +15,7 @@ and the [general Madek Documentation](https://madek.readthedocs.io/)* which ansible-playbook || echo "install ansible first!" git clone git@github:yourUserName/madek-instance my-madek cd my-madek - git submodule update --init Madek - cd Madek && git reset --hard origin/release && git submodule update --init --recursive deploy && cd - + sh -c 'git submodule update --init Madek && cd Madek && git submodule update --init --recursive deploy' ``` 1. prepare a server running [Debian `jessie`](https://www.debian.org/releases/jessie/), @@ -89,11 +88,25 @@ The only exception is `README.md`, we won't touch it because you'll likely want ## git-crypt -``` +set up and add master secret: + +```sh which git-crypt || echo 'install `git-crypt` first!' cp examples/git-crypt/.git{ignore,attributes} . git commit .gitignore .gitattributes -m 'setup git-crypt' git crypt init git crypt add-gpg-user you@example.com -git commit master_secret.txt -m 'add encrypted secret' +git add master_secret.txt && git commit -m 'add encrypted secret' +git crypt status +``` + +if needed, set up secret variables: + +```sh +# create hosts file +sh -c "echo \"$(cat examples/git-crypt/hosts_example)\"" > hosts +# create host_vars +sh -c "echo \"$(cat examples/git-crypt/group_vars_secret_example.yml)\"" > group_vars/secrets.yml +git add group_vars/secrets.yml && git commit -m 'add encrypted secrets' +git crypt status ``` diff --git a/examples/git-crypt/group_vars_example.yml b/examples/git-crypt/group_vars_example.yml new file mode 100644 index 0000000..afde5f5 --- /dev/null +++ b/examples/git-crypt/group_vars_example.yml @@ -0,0 +1,3 @@ +# ansible_ssh_port: 12345 +# ansible_ssh_user: my_ssh_user +# zencoder_api_key: "my-key" diff --git a/examples/git-crypt/hosts_example b/examples/git-crypt/hosts_example new file mode 100644 index 0000000..0e2115b --- /dev/null +++ b/examples/git-crypt/hosts_example @@ -0,0 +1,5 @@ +[secrets] +${MADEK_HOSTNAME} + +[madek] +${MADEK_HOSTNAME} diff --git a/examples/host_vars_example.yml b/examples/host_vars_example.yml index 283408a..c8fdbbe 100644 --- a/examples/host_vars_example.yml +++ b/examples/host_vars_example.yml @@ -22,18 +22,7 @@ zencoder_enabled: false # customize # madek_webapp_html_extra_head_start: | -# +# # madek_webapp_html_extra_head_end: | # From 00d0eed5842434387116e09578f285f1ee2b7eb6 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Mon, 30 Jan 2017 19:06:48 +0100 Subject: [PATCH 16/66] guide: HTTPS w/ letsencrypt --- GUIDE.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/GUIDE.md b/GUIDE.md index c82ef53..7140d76 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -110,3 +110,17 @@ sh -c "echo \"$(cat examples/git-crypt/group_vars_secret_example.yml)\"" > group git add group_vars/secrets.yml && git commit -m 'add encrypted secrets' git crypt status ``` + +## HTTPS + +Secure Communications for your users (HTTPS) can be enabled +by obtaining a TLS certificate and configure apache to use it. +This can be done easily using `certbot` by [LetsEncrypt](https://letsencrypt.org). + + +1. Install `certbot`: `sudo apt-get install python-certbot-apache -t jessie-backports` +2. Get cert: `certbot certonly --apache -d madek.example.com` +3. Configure apache: `certbot run -n --apache --redirect --apache-vhost-root /etc/apache2/madek -d madek.example.com` + - even more secure (SSL Labs `A+` instead of `A`): `certbot run -n --apache --redirect --hsts --uir --strict-permissions --apache-vhost-root /etc/apache2/madek -d madek.example.com` + +Also **re-run step 3 after each deploy**! From 4aceb58a9f00bf41797868f3dfb63ae7d43b6e76 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Mon, 30 Jan 2017 19:14:29 +0100 Subject: [PATCH 17/66] [Madek-instance] initial release from now on all updates to this project (pushes to `master`) will only happen once for each Madek release all commits will be prefixed like this one (or [Madek] for Madek relases) From b2cc63450099fe59a2240b2e799f30422da2074a Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Mon, 30 Jan 2017 23:33:25 +0100 Subject: [PATCH 18/66] [Madek] release v3.0.0-8.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index bd6e0b5..843d41d 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit bd6e0b5b6bcdf7b13c068a4585d22929bc28bd3e +Subproject commit 843d41d4409a4f47ee3cf39624497225d6ab7ce7 From 0d3b9cb696be0ea2ec4244a7be7689ab4189ebc5 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Mon, 20 Feb 2017 17:32:31 +0100 Subject: [PATCH 19/66] [Madek] release v3.0.0-9.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 843d41d..f160564 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 843d41d4409a4f47ee3cf39624497225d6ab7ce7 +Subproject commit f160564014f460ed2fcb4151424f3aeb11af0949 From 0e0be575285da3ee274b1c1ab1f789c1e00c9b08 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Tue, 28 Feb 2017 19:42:52 +0100 Subject: [PATCH 20/66] [Madek] release: v3.0.0-10.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index f160564..32a3e41 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit f160564014f460ed2fcb4151424f3aeb11af0949 +Subproject commit 32a3e41d56786825f0f16dce8c98b129413cf49c From 23dfea3540937fd09aaebee0b152fe9a4472060b Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Thu, 16 Mar 2017 17:52:23 +0100 Subject: [PATCH 21/66] [Madek] release v3.0.0-10.2 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 32a3e41..0574a13 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 32a3e41d56786825f0f16dce8c98b129413cf49c +Subproject commit 0574a13ec7c77ab08b9d8178789b36ca0b5fbd60 From c97a408e8545e651692df8f0c7f9393f71bba184 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Thu, 30 Mar 2017 21:55:23 +0200 Subject: [PATCH 22/66] [Madek] release v3.0.0-11.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 0574a13..dab72fd 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 0574a13ec7c77ab08b9d8178789b36ca0b5fbd60 +Subproject commit dab72fd771ee61369cc1b7226c6d4483b3382e6b From 634cf93efd45f315113894959d40c4eef2fefc9f Mon Sep 17 00:00:00 2001 From: Max Albrecht <1@178.is> Date: Tue, 11 Apr 2017 21:06:17 +0200 Subject: [PATCH 23/66] [Madek-instance] GUIDE: certbot is now run automatically on deploy --- GUIDE.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/GUIDE.md b/GUIDE.md index 7140d76..b4d4852 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -123,4 +123,5 @@ This can be done easily using `certbot` by [LetsEncrypt](https://letsencrypt.org 3. Configure apache: `certbot run -n --apache --redirect --apache-vhost-root /etc/apache2/madek -d madek.example.com` - even more secure (SSL Labs `A+` instead of `A`): `certbot run -n --apache --redirect --hsts --uir --strict-permissions --apache-vhost-root /etc/apache2/madek -d madek.example.com` -Also **re-run step 3 after each deploy**! +If a certificate set up this way is found on the server, the deploy process will automatically use `certbot` for configuration with recommended settings. +You only have to re-run `certbot` yourself after each deploy if you prefer other settings. From 5fd0f2b4cfa1d3cbf2ebd6701a0029fef9af0fde Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Fri, 21 Apr 2017 15:20:24 +0200 Subject: [PATCH 24/66] [Madek-instance] symlink Madek's ansible.cfg config will only be applied when its in CWD, but examples in Guide issue playbook command from instance inventory root. making a symlink ensures that the correct config is used, similar to symlinking the `all.yml` vars file. --- ansible.cfg | 1 + 1 file changed, 1 insertion(+) create mode 120000 ansible.cfg diff --git a/ansible.cfg b/ansible.cfg new file mode 120000 index 0000000..adf3f72 --- /dev/null +++ b/ansible.cfg @@ -0,0 +1 @@ +Madek/deploy/ansible.cfg \ No newline at end of file From e075a2403d80148448d25d08f00cc8d6214e19b3 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Wed, 10 May 2017 20:15:01 +0200 Subject: [PATCH 25/66] [Madek-instance] GUIDE: new stable branch for upgrades --- GUIDE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GUIDE.md b/GUIDE.md index b4d4852..ca24972 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -62,7 +62,7 @@ secret to the repository in encrypted form (*recommended*). 1. update `Madek` submodule reference to latest release - either by accepting a Pull Request (when enabled) - - or manually: `./scripts/update_madek_latest release` + - or manually: `./scripts/update_madek_latest stable` 1. run the setup playbook again: `ansible-playbook -i hosts Madek/deploy/play_setup-and-deploy.yml` From ea1e6cbb7057f3df3a8f9cfb56030ade2c90d05c Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Wed, 10 May 2017 20:16:01 +0200 Subject: [PATCH 26/66] [Madek] release v3.12.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index dab72fd..2688b2f 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit dab72fd771ee61369cc1b7226c6d4483b3382e6b +Subproject commit 2688b2f79c935cacf7e040125beb0b4398936917 From 93c436ea21da28e1a9edd2f74d1b2377fc07c803 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Wed, 21 Jun 2017 18:57:37 +0200 Subject: [PATCH 27/66] [Madek] release v3.13.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 2688b2f..a1a40e0 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 2688b2f79c935cacf7e040125beb0b4398936917 +Subproject commit a1a40e02816a85d9fc699bc34618802947a0e84b From d8f0dfb20d45f24a550e07d8355814c571df5d09 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Wed, 21 Jun 2017 18:57:58 +0200 Subject: [PATCH 28/66] [Madek] release v3.13.1 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index a1a40e0..0e309ff 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit a1a40e02816a85d9fc699bc34618802947a0e84b +Subproject commit 0e309fff5185080895aaa932765cd4b4d67b731d From b6419715b20d53f60f64c2687dd88f9c8657b4e4 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Thu, 13 Jul 2017 08:25:54 +0200 Subject: [PATCH 29/66] [Madek] release v3.14.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 0e309ff..762ca75 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 0e309fff5185080895aaa932765cd4b4d67b731d +Subproject commit 762ca755ce997561bfacccb525b9467dbe51ad35 From 98cffe4ccfcbec530a3b2f94ccd3e6ab35b70952 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Thu, 14 Dec 2017 13:10:08 +0100 Subject: [PATCH 30/66] [Madek] release v3.19.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 762ca75..9fc1682 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 762ca755ce997561bfacccb525b9467dbe51ad35 +Subproject commit 9fc16822cfec43748180107fdfacca318d39f3df From a34e8132207b4cd96e300272b756878c6d31cc79 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Fri, 16 Feb 2018 16:38:15 +0100 Subject: [PATCH 31/66] [Madek] release v3.20.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 9fc1682..bbeea18 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 9fc16822cfec43748180107fdfacca318d39f3df +Subproject commit bbeea18cec3cdb873c69c26f3b8024d434e1cbcc From 2147fc5f21ebe606541d194f226b48a37d41447a Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Fri, 22 Jun 2018 12:58:49 +0200 Subject: [PATCH 32/66] [Madek] release v3.23.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index bbeea18..26973ed 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit bbeea18cec3cdb873c69c26f3b8024d434e1cbcc +Subproject commit 26973ed1067ddd5867c178c3b38b632507b47d77 From f5368d371b98c28ed679e1af97235f4d6e46be45 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Tue, 27 Nov 2018 13:47:36 +0100 Subject: [PATCH 33/66] [Madek] release v3.24.1 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 26973ed..3981261 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 26973ed1067ddd5867c178c3b38b632507b47d77 +Subproject commit 39812612c949e900280e6d6159f6886d99486697 From c2b59a19d21539504b5f9849580bea861499f283 Mon Sep 17 00:00:00 2001 From: Max Albrecht <1@178.is> Date: Mon, 1 Apr 2019 10:45:24 +0200 Subject: [PATCH 34/66] [Madek] release v3.25.0 (#7) --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 3981261..71f1dc2 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 39812612c949e900280e6d6159f6886d99486697 +Subproject commit 71f1dc27f795edd92b27d9f0a78384b0e0115c74 From dcea0874845c131cd80f8d3d3275c119fab0364d Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Tue, 21 May 2019 13:49:03 +0200 Subject: [PATCH 35/66] [Madek] release v3.27.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 71f1dc2..d94b3a4 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 71f1dc27f795edd92b27d9f0a78384b0e0115c74 +Subproject commit d94b3a4700f88dc73426b1e6a30c5b4de9bb3a65 From 1a891f3157421679e59adba52fb45dc5cb531e65 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Mon, 1 Feb 2021 16:42:34 +0100 Subject: [PATCH 36/66] [Madek] GUIDE: only recommend generating from template instead of forking --- GUIDE.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/GUIDE.md b/GUIDE.md index ca24972..260d551 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -7,8 +7,7 @@ and the [general Madek Documentation](https://madek.readthedocs.io/)* ## setup & install -1. ["Fork" this repository on github](https://github.com/Madek/madek-instance/fork) - *(only required if you want to receive updates as Pull Requests)* +1. [Generate your own inventory repository by using this template](https://github.com/Madek/madek-instance/generate) 1. set up inventory on a computer running Linux or macOS (will be the "control machine") ```sh From 93176f4c5dc5569a5f563d4f57af689b60200f12 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Mon, 26 Jul 2021 12:48:11 +0200 Subject: [PATCH 37/66] [Madek] release v3.32.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index d94b3a4..aa2a1d3 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit d94b3a4700f88dc73426b1e6a30c5b4de9bb3a65 +Subproject commit aa2a1d3274787050e3f9c5865bceedf363f54e23 From 998062033576620ac6026dad29e17dd10569d9b3 Mon Sep 17 00:00:00 2001 From: Max Albrecht Date: Fri, 24 Jun 2022 15:30:47 +0200 Subject: [PATCH 38/66] [Madek] release v3.33.1 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index aa2a1d3..9253a5d 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit aa2a1d3274787050e3f9c5865bceedf363f54e23 +Subproject commit 9253a5d88d1e8099df2b32cfe3220ab1fd95855b From bd8fdd684c19b83ab070cf6b00fd46344eae9ffe Mon Sep 17 00:00:00 2001 From: Matus Kmit Date: Thu, 8 Sep 2022 12:28:44 +0200 Subject: [PATCH 39/66] [Madek] release v3.34.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 9253a5d..af3d306 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 9253a5d88d1e8099df2b32cfe3220ab1fd95855b +Subproject commit af3d306dcffe300b00ccb278e5d262460cc11320 From 4ce187b8c122ccd9a46bcb0714c44ec0fe9c01cd Mon Sep 17 00:00:00 2001 From: Matus Kmit Date: Thu, 8 Sep 2022 12:32:56 +0200 Subject: [PATCH 40/66] better update madek script --- scripts/update_madek_latest | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/scripts/update_madek_latest b/scripts/update_madek_latest index fb534f8..b13a4c4 100755 --- a/scripts/update_madek_latest +++ b/scripts/update_madek_latest @@ -1,8 +1,23 @@ -#!/bin/sh -exu -CHANNEL=$1 +#!/bin/bash -exu + +RELEASE_NAME=$1 +CHANNEL=${2:-stable} + +git pull cd Madek git fetch git submodule foreach --recursive 'git reset --hard HEAD' git reset --hard "origin/${CHANNEL}" -git submodule update --recursive deploy +git submodule update --recursive --init --force + +cd - +git add Madek + +if [[ -n "${RELEASE_NAME}" ]]; then + git commit -m "[Madek] ${RELEASE_NAME}" +else + git commit -m "[Madek] x.y.z" --edit +fi + +git push From de3f9718e9b486dc8b670f365eea656804b298e8 Mon Sep 17 00:00:00 2001 From: Matus Kmit Date: Wed, 8 Mar 2023 21:41:33 +0530 Subject: [PATCH 41/66] [Madek] release: v3.35.1 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index af3d306..45d3559 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit af3d306dcffe300b00ccb278e5d262460cc11320 +Subproject commit 45d3559a2674fd0c2fb9b67d2001311ac2b04a43 From 20477ea4632b11a29c30c2ee443720a4c5d34066 Mon Sep 17 00:00:00 2001 From: Matus Kmit Date: Thu, 15 Jun 2023 13:50:44 +0200 Subject: [PATCH 42/66] [Madek] v4.1.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 45d3559..71f953f 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 45d3559a2674fd0c2fb9b67d2001311ac2b04a43 +Subproject commit 71f953f16e51383898656aa6efb99bb9907b9217 From 4cc4461ed6f99f64b171f9a0756e1f27158ba0df Mon Sep 17 00:00:00 2001 From: uvb Date: Tue, 10 Oct 2023 15:38:16 +0200 Subject: [PATCH 43/66] [Madek] v4.2.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 71f953f..82e32e8 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 71f953f16e51383898656aa6efb99bb9907b9217 +Subproject commit 82e32e89c1e855d6e11d5cc83f9b4d78111ae658 From ad004d777a5c43ebb119df4cc7b9eacab8854b8f Mon Sep 17 00:00:00 2001 From: Matus Kmit Date: Wed, 24 Jan 2024 16:28:03 +0100 Subject: [PATCH 44/66] [Madek] v4.2.1 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 82e32e8..ee3073e 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 82e32e89c1e855d6e11d5cc83f9b4d78111ae658 +Subproject commit ee3073e7aad1edb90b5ad4231e65a7219aab4931 From 228085a2a9e7c83d62f51d0b1683d3b8b89f98bf Mon Sep 17 00:00:00 2001 From: uvb Date: Tue, 19 Mar 2024 15:34:51 +0100 Subject: [PATCH 45/66] [Madek] v4.4.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index ee3073e..2cc0d45 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit ee3073e7aad1edb90b5ad4231e65a7219aab4931 +Subproject commit 2cc0d457f52a8909591c69053d9e1c82ba69aedf From 47df523ec466706feef4fd72d975e1e2d7396f66 Mon Sep 17 00:00:00 2001 From: Matus Kmit Date: Fri, 22 Mar 2024 10:08:39 +0100 Subject: [PATCH 46/66] [Madek] v4.4.1 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 2cc0d45..763fef7 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 2cc0d457f52a8909591c69053d9e1c82ba69aedf +Subproject commit 763fef7504eb4c3d1b1efe1997ad1bea9542ba2b From bfcb61abf7705214ebdc2e82eb955c6e87c544df Mon Sep 17 00:00:00 2001 From: uvb Date: Tue, 26 Mar 2024 13:43:28 +0100 Subject: [PATCH 47/66] [Madek] v4.4.2 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 763fef7..3ec47dd 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 763fef7504eb4c3d1b1efe1997ad1bea9542ba2b +Subproject commit 3ec47ddb6093910ec0903b87a32789ace276f693 From 95ea304196eeddb91920322dbe4195beb9532a5b Mon Sep 17 00:00:00 2001 From: uvb Date: Tue, 16 Apr 2024 15:14:50 +0200 Subject: [PATCH 48/66] [Madek] v4.4.3 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 3ec47dd..907e910 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 3ec47ddb6093910ec0903b87a32789ace276f693 +Subproject commit 907e91028a96f2d2c6f63f614ad83da64cc11f98 From 0c064466aaa4335cf35d487d243f52e4a2ff1543 Mon Sep 17 00:00:00 2001 From: uvb Date: Mon, 29 Apr 2024 14:17:45 +0200 Subject: [PATCH 49/66] [Madek] v4.4.4 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 907e910..f348758 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 907e91028a96f2d2c6f63f614ad83da64cc11f98 +Subproject commit f34875815784a90a4330e8985b41169becd4edc7 From c571ad0ac10c2f3d01a3ae0b432aa80c2f7b4af5 Mon Sep 17 00:00:00 2001 From: Matus Kmit Date: Tue, 9 Jul 2024 14:37:27 +0200 Subject: [PATCH 50/66] [Madek] v4.5.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index f348758..b5fe365 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit f34875815784a90a4330e8985b41169becd4edc7 +Subproject commit b5fe36517a716ad2f7e7d1bd41f07056f6b03eea From 91b93828a16303cd849e2916606e051be428b891 Mon Sep 17 00:00:00 2001 From: Matus Kmit Date: Thu, 11 Jul 2024 15:38:25 +0200 Subject: [PATCH 51/66] [Madek] v4.5.1 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index b5fe365..4ac1146 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit b5fe36517a716ad2f7e7d1bd41f07056f6b03eea +Subproject commit 4ac1146a4e76da66f37ce5f268b792a6c9f768cf From 9f3da217daf3c1e9b21432072481f0db1e13fd2c Mon Sep 17 00:00:00 2001 From: uvb Date: Tue, 5 Nov 2024 13:38:51 +0100 Subject: [PATCH 52/66] [Madek] v4.6.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 4ac1146..0616a84 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 4ac1146a4e76da66f37ce5f268b792a6c9f768cf +Subproject commit 0616a844bafc79f8425afa90f5dfc60aa6900521 From d2155207217a26531325757fba5aafee1c8b9b67 Mon Sep 17 00:00:00 2001 From: uvb Date: Wed, 5 Feb 2025 17:16:36 +0100 Subject: [PATCH 53/66] [Madek] v4.7.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 0616a84..434c76a 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 0616a844bafc79f8425afa90f5dfc60aa6900521 +Subproject commit 434c76aef73abc813f2795b0852b8341402d713f From 8bbbb70b62a3b13dac11e65dbafbbb2f6c3710b2 Mon Sep 17 00:00:00 2001 From: uvb Date: Tue, 4 Mar 2025 13:49:42 +0100 Subject: [PATCH 54/66] [Madek] v4.7.1 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 434c76a..feddaa5 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 434c76aef73abc813f2795b0852b8341402d713f +Subproject commit feddaa599f5f6668b803b7f79cfb635147b213f4 From 383ace87293a027c34c64f8f5d1d2fae414bfb6c Mon Sep 17 00:00:00 2001 From: uvb Date: Mon, 5 May 2025 10:21:08 +0200 Subject: [PATCH 55/66] [Madek] v4.8.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index feddaa5..cae404d 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit feddaa599f5f6668b803b7f79cfb635147b213f4 +Subproject commit cae404d17b495bc25b15dcfa100c4368187c2304 From a06f66d32c2b46c87cf128d03054a60d8cc5f96b Mon Sep 17 00:00:00 2001 From: uvb Date: Thu, 8 May 2025 16:14:45 +0200 Subject: [PATCH 56/66] [Madek] v4.8.1 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index cae404d..3373221 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit cae404d17b495bc25b15dcfa100c4368187c2304 +Subproject commit 337322158c0ed0f343bb215117c606acab753b21 From b66b3775c0f03564c0be13be5b3302b227921b9c Mon Sep 17 00:00:00 2001 From: uvb Date: Thu, 12 Jun 2025 16:18:32 +0200 Subject: [PATCH 57/66] [Madek] v4.9.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 3373221..b9b37ec 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 337322158c0ed0f343bb215117c606acab753b21 +Subproject commit b9b37ec221980d1d12b8f7f8b6ede6b0b0f795f1 From 6ea59f0fc6d3423ac4d27d2d2eb2754258499ed4 Mon Sep 17 00:00:00 2001 From: uvb Date: Mon, 16 Jun 2025 16:31:35 +0200 Subject: [PATCH 58/66] [Madek] v4.9.1 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index b9b37ec..1f9c581 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit b9b37ec221980d1d12b8f7f8b6ede6b0b0f795f1 +Subproject commit 1f9c581db3270835401b2533cdf67be6a2ad00c8 From 049a5f01a9d4227f21c1807831602a534a960cd9 Mon Sep 17 00:00:00 2001 From: uvb Date: Tue, 24 Jun 2025 13:06:54 +0200 Subject: [PATCH 59/66] [Madek] v4.9.2 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 1f9c581..22842b2 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 1f9c581db3270835401b2533cdf67be6a2ad00c8 +Subproject commit 22842b2456846594c34b7a93cfb8e12b3af8a4d3 From 9b7c03719fe9711b80287cc3328e8feb994f9574 Mon Sep 17 00:00:00 2001 From: uvb Date: Thu, 26 Jun 2025 16:02:55 +0200 Subject: [PATCH 60/66] [Madek] v4.9.3 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 22842b2..694fb10 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 22842b2456846594c34b7a93cfb8e12b3af8a4d3 +Subproject commit 694fb10d34cd5b41b97b74e2f6d5a252a3561264 From 43fccfed9814a77165cd64d57e2dd67bcc0e5045 Mon Sep 17 00:00:00 2001 From: uvb Date: Mon, 28 Jul 2025 10:23:09 +0200 Subject: [PATCH 61/66] [Madek] v4.10.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 694fb10..c70daa2 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 694fb10d34cd5b41b97b74e2f6d5a252a3561264 +Subproject commit c70daa22f53713e556c9594f91e7b2bbcb3a31f3 From 61acadc293cf503f1043d9795f7463d8934255bb Mon Sep 17 00:00:00 2001 From: uvb Date: Tue, 2 Sep 2025 16:48:25 +0200 Subject: [PATCH 62/66] [Madek] v4.10.1 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index c70daa2..95f5daf 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit c70daa22f53713e556c9594f91e7b2bbcb3a31f3 +Subproject commit 95f5daf4fcb080e57f7209315c4e6f32caf1a04f From bfa9da2815526ec9fa9425d634f919fa3d8ab3b9 Mon Sep 17 00:00:00 2001 From: uvb Date: Mon, 29 Sep 2025 11:21:57 +0200 Subject: [PATCH 63/66] [Madek] v4.10.2 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index 95f5daf..b435515 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit 95f5daf4fcb080e57f7209315c4e6f32caf1a04f +Subproject commit b435515ff62ad9cda3d5473a41ccb20633aa0a74 From 9295093a39bedc5108f8e0256d723139c080d980 Mon Sep 17 00:00:00 2001 From: uvb Date: Tue, 9 Dec 2025 15:55:42 +0100 Subject: [PATCH 64/66] [Madek] v4.11.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index b435515..d0c962c 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit b435515ff62ad9cda3d5473a41ccb20633aa0a74 +Subproject commit d0c962c2826c96b38c01264a7a7902893a9f780b From 036363bfb3b56a75ad312b26b9b73c369792dcc4 Mon Sep 17 00:00:00 2001 From: uvb Date: Thu, 18 Dec 2025 11:38:02 +0100 Subject: [PATCH 65/66] [Madek] v4.11.1 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index d0c962c..bbd2eba 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit d0c962c2826c96b38c01264a7a7902893a9f780b +Subproject commit bbd2eba1fb8f7358ee034562d671bf7c5108fbdf From 4215a05d3882dd9059998f46064ff4442ce83c83 Mon Sep 17 00:00:00 2001 From: uvb Date: Mon, 2 Feb 2026 11:04:59 +0100 Subject: [PATCH 66/66] [Madek] v4.12.0 --- Madek | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Madek b/Madek index bbd2eba..10e31d1 160000 --- a/Madek +++ b/Madek @@ -1 +1 @@ -Subproject commit bbd2eba1fb8f7358ee034562d671bf7c5108fbdf +Subproject commit 10e31d1897949502f53c6c6cacfd1de370fc8365