Skip to content

Commit

Permalink
Merge pull request #35 from osmollo/feat/9.1
Browse files Browse the repository at this point in the history
Release 9.1
  • Loading branch information
osmollo authored May 17, 2023
2 parents f60c525 + 705c541 commit 6aab972
Show file tree
Hide file tree
Showing 36 changed files with 268 additions and 86 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/new_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Read release.json
uses: notiz-dev/github-action-json-property@release
Expand All @@ -22,16 +22,16 @@ jobs:
- name: Show version number
run: echo "Version is ${{ steps.package_info.outputs.prop }}"

- name: "Build Changelog"
id: build_changelog
uses: scottbrenner/generate-changelog-action@master
# - name: "Build Changelog"
# id: build_changelog
# uses: scottbrenner/generate-changelog-action@master

- name: Create Release
id: create_release
uses: actions/create-release@latest
uses: ncipollo/release-action@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: "v${{ steps.package_info.outputs.prop }}"
release_name: Release v${{ steps.package_info.outputs.prop }}
body: ${{ steps.build_changelog.outputs.changelog }}
tag: "v${{ steps.package_info.outputs.prop }}"
name: Release v${{ steps.package_info.outputs.prop }}
# body: ${{ steps.build_changelog.outputs.changelog }}
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# CHANGELOG

- [CHANGELOG](#changelog)
- [9.1](#91)
- [9.0](#90)
- [VERSIONES ANTERIORES](#versiones-anteriores)
- [Versión 8](#versión-8)
Expand All @@ -12,6 +13,26 @@
- [Versión 2](#versión-2)
- [Versión 1](#versión-1)

## 9.1

- Soportado [Fedora 38](https://docs.fedoraproject.org/en-US/releases/f38/)
- Soportado [Ubuntu 23.04](https://ubuntu.com/download/desktop)
- Instalación del plugin **compose** para docker, en lugar de `docker-compose`
- Actualizadas las versiones de algunos github actions
- Instalación de [SoapUI](https://www.soapui.org/)
- Subido a 20 el valor `max_parallel_downloads` en la configuración de __DNF__ para **Fedora**
- Instalación de [bat-extras](https://github.com/eth-p/bat-extras)
- Post_install:
- Entradas en `~/.ssh/config`
- Simplificación de las entradas de ssh
- Nuevos repositorios git
- Restauración de la configuración de **DBeaver**
- Login en [Mega](https://mega.io/es/) con 2FA activado
- Nuevo login en registry de docker
- Corrección de errores:
- Instalación de **Postman** y **SoapUI** por defecto
- No existe `docker-scan-plugin` para fedora

## 9.0

- Instalación de [AstroNvim](https://github.com/AstroNvim/AstroNvim) con **Neovim**
Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ Por defecto se instala el siguiente software:
| [Skype](https://www.skype.com/es/) | skype | install_skype | social | Cliente de mensajería de Skype |
| [Slack](https://slack.com/intl/es-es/) | slack | install_slack | social | Cliente de mensajería para entornos de trabajo |
| [Singlebox](https://webcatalog.io/singlebox/) | singlebox | install_singlebox | social | Administrador de clientes de mensajería |
| [SoapUI](https://www.soapui.org/) | soapui | install_soapui | dev | Cliente API SoapUI |
| [Spotify](https://www.spotify.com/es/premium/?checkout=false) | spotify | install_spotify | media | Cliente de Spotify |
| [Starship](https://starship.rs/es-ES/) | starship | install_starship | shell | Gestor de configuración del prompt |
| [Steam](https://store.steampowered.com/?l=spanish) | steam | install_steam | games | Cliente Steam para juegos de PC |
Expand Down Expand Up @@ -172,11 +173,16 @@ ansible-playbook install.yml -t chromium -e install_chromium=true

### Post instalación

Las variables necesarias para la ejecución de este role se encuentran en `./roles/post_install/defaults/main.yml.gpg`
Las variables necesarias para la ejecución de este role se encuentran en `./roles/post_install/defaults/main.yml.gpg`. Para poder tener acceso a todos los secretos necesarios para la configuración, es necesario ejecutar el siguiente comando:

```shell
ansible-playbook playbooks/prepare_post.yml
eval $(op signin)
```

Y a continuación ejecutar los siguientes playbooks:

```shell
ansible-playbook playbooks/prepare_post.yml
ansible-playbook post_install.yml
```

Expand Down
20 changes: 19 additions & 1 deletion playbooks/load_distro_vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,27 @@
ubuntu_version_long: "{{ ubuntu_versions[ubuntu_codename] }}"
vars:
ubuntu_versions:
jammy: "22.04"
lunar: "23.04"
when: linux_distribution == "ubuntu"

- name: "Is Ubuntu LTS?"
when: linux_distribution == "ubuntu"
block:
- name: "Read /etc/os-release"
shell: |
set -o pipefail
grep "VERSION=" /etc/os-release
args:
executable: /bin/bash
register: response_lts
changed_when: false

- name: "Set variable 'ubuntu_lts' to '{{ is_lts }}'"
vars:
is_lts: "{{ 'LTS' in response_lts.stdout }}"
set_fact:
ubuntu_lts: "{{ is_lts }}"

- name: "Set FEDORA_VERSION variable"
set_fact:
fedora_version: "{{ ansible_distribution_version }}"
Expand Down
2 changes: 1 addition & 1 deletion release.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "9.0"
"version": "9.1"
}
3 changes: 0 additions & 3 deletions roles/common/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ common_packages:
- rsync

python_modules:
- pre-commit
- pylint
- flake8
- pep8
Expand All @@ -31,8 +30,6 @@ python_modules:
- pycodestyle
- lxml
- jedi
- bs4
- beautifulsoup4

bad_snap_packages:
- gnome-calculator
Expand Down
43 changes: 35 additions & 8 deletions roles/common/tasks/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,38 @@
update_cache: true
when: linux_distribution == "arch"

- name: "Install setuptools python module"
pip:
name:
- setuptools

- name: "Install python modules"
pip:
name: "{{ python_modules }}"
- when: linux_distribution != "ubuntu"
block:
- name: "Install setuptools python module"
pip:
name:
- setuptools

- name: "Install python modules"
pip:
name: "{{ python_modules }}"

- when: linux_distribution == "ubuntu"
block:
- name: "Install setuptools"
apt:
name: python3-setuptools
state: present
update_cache: true

- name: "Install python modules"
vars:
prefix: "python3-"
quitar:
- pylint
- docker-py
- gitpython
poner:
- pylint-common
- docker
- git
to_install: "{{ [prefix] | product(python_modules | difference(quitar) + poner) | map('join') | list }}"
apt:
name: "{{ to_install }}"
state: present
update_cache: true
2 changes: 1 addition & 1 deletion roles/common/tasks/update_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
line: "{{ item }}"
state: present
loop:
- max_parallel_downloads=10
- max_parallel_downloads=20
- fastestmirror=True

- name: "[FEDORA] update all packages to the latest version"
Expand Down
17 changes: 4 additions & 13 deletions roles/extra_software/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ install_chrome: false
install_teamviewer: true
install_nomachine: false
install_ecs: false
install_postman: false
install_postman: true
install_skype: false
install_java: false
install_apachedirectory: false
Expand Down Expand Up @@ -49,7 +49,7 @@ install_bitwarden: false
install_lexnet: false
install_pass: false
install_bucklespring: false
install_protonvpn: true
install_protonvpn: false
install_prezto: false
install_etcher: false
install_woeusb: false
Expand Down Expand Up @@ -113,6 +113,7 @@ install_edge: false
install_teams: true
install_globalprotect: true
install_dbeaver: true
install_soapui: true

tlp_battery_min: 75
tlp_battery_max: 85
Expand Down Expand Up @@ -153,21 +154,11 @@ broot_latest_url: "https://github.com/Canop/broot/releases/latest"
erdtree_latest_url: "https://github.com/solidiquis/erdtree/releases/latest"
procs_latest_url: "https://github.com/dalance/procs/releases/latest"
dbeaver_latest_url: "https://github.com/dbeaver/dbeaver/releases/latest"
zoxide_latest_url: "https://github.com/ajeetdsouza/zoxide/releases/latest"

ohmyzsh_installer: "https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh"
ohmybash_installer: "https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh"

dropbox_flatpak: "https://dl.flathub.org/repo/appstream/com.dropbox.Client.flatpakref"
telegram_flatpak: "https://dl.flathub.org/repo/appstream/org.telegram.desktop.flatpakref"
slack_flatpak: "https://flathub.org/repo/appstream/com.slack.Slack.flatpakref"
pycharm_flatpak: "https://flathub.org/repo/appstream/com.jetbrains.PyCharm-Community.flatpakref"
postman_flatpak: "https://flathub.org/repo/appstream/com.getpostman.Postman.flatpakref"
skype_flatpak: "https://flathub.org/repo/appstream/com.skype.Client.flatpakref"
franz_flatpak: "https://flathub.org/repo/appstream/com.meetfranz.Franz.flatpakref"
kdenlive_flatpak: "https://dl.flathub.org/repo/appstream/org.kde.kdenlive.flatpakref"
marktext_flatpak: "https://dl.flathub.org/repo/appstream/com.github.marktext.marktext.flatpakref"
teams_flatpak: "https://dl.flathub.org/repo/appstream/com.github.IsmaelMartinez.teams_for_linux.flatpakref"

apachedirectory_url: "https://ftp.cixug.es/apache/directory/studio/2.0.0.v20210213-M16/ApacheDirectoryStudio-2.0.0.v20210213-M16-linux.gtk.x86_64.tar.gz"

deluge_package: deluge
Expand Down
7 changes: 0 additions & 7 deletions roles/extra_software/tasks/containers/docker/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@
enabled: true
state: restarted

- name: "[DOCKER_COMPOSE] Download Docker Compose binary"
import_tasks: docker_compose.yml
when: linux_distribution != "arch"
tags:
- dockercompose
- update

- name: "[DIVE] Install Dive"
block:
- name: "[DIVE] Get latest version of Dive"
Expand Down
12 changes: 3 additions & 9 deletions roles/extra_software/tasks/containers/docker/docker_arch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,9 @@

- name: "[DOCKER] [ARCH] Install docker"
pacman:
name: "docker"
name:
- "docker"
- "docker-compose"
state: present
update_cache: true

- name: "[DOCKER] [ARCH] Install docker-compose"
pacman:
name: "docker-compose"
state: present
update_cache: true
tags:
- dockercompose

Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,14 @@
- docker-ce
- docker-ce-cli
- containerd.io
- docker-compose-plugin
state: present
update_cache: true

- name: "[DOCKER] [FEDORA] create alias"
vars:
alias_name: docker-compose
alias_command: docker compose
import_role:
name: tools/create_alias

Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,14 @@
- docker-ce
- docker-ce-cli
- containerd.io
- docker-compose-plugin
state: present
update_cache: true

- name: "[DOCKER] [DEB] create alias"
vars:
alias_name: docker-compose
alias_command: docker compose
import_role:
name: tools/create_alias

2 changes: 1 addition & 1 deletion roles/extra_software/tasks/dev/dbeaver/dbeaver_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

- name: "[DBEAVER] [DEB] create repository file"
copy:
content: "deb https://dbeaver.io/debs/dbeaver-ce /"
content: "deb [arch=amd64 signed-by=/usr/share/keyrings/dbeaver.gpg] https://dbeaver.io/debs/dbeaver-ce /"
dest: /etc/apt/sources.list.d/dbeaver.list
owner: root
group: root
Expand Down
9 changes: 7 additions & 2 deletions roles/extra_software/tasks/dev/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,12 @@

- name: "[DEV] Install DBeaver"
import_tasks: dbeaver/dbeaver.yml
when:
- install_dbeaver
when: install_dbeaver
tags:
- dbeaver

- name: "[DEV] install SoapUI"
import_tasks: soapui/soapui.yml
when: install_soapui
tags:
- soapui
4 changes: 4 additions & 0 deletions roles/extra_software/tasks/dev/soapui/soapui.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---

- include_tasks: "soapui_{{ linux_distribution }}.yml"
when: linux_distribution in ['fedora', 'arch']
8 changes: 8 additions & 0 deletions roles/extra_software/tasks/dev/soapui/soapui_arch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---

- name: "[SOAPUI] [ARCH] install SoapUI"
become: false
yay:
name: "{{ soapui_package }}"
state: present
update_cache: true
6 changes: 6 additions & 0 deletions roles/extra_software/tasks/dev/soapui/soapui_fedora.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---

- name: "[SOAPUI] [FEDORA] Install SoapUI flatpak"
flatpak:
name: "{{ soapui_flatpak }}"
state: present
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

- name: "[NEOVIM] [UBUNTU] Install Neovim"
apt:
deb: "{{ neovim_deb_package }}"
deb: "https://github.com/neovim/neovim/releases/download/v0.8.3/nvim-linux64.deb"
state: present
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
- name: "[1PASSWORD] [DEB] install gpg key"
apt_key:
url: https://downloads.1password.com/linux/keys/1password.asc
keyring: /etc/apt/trusted.gpg.d/1password-archive-keyring.gpg
keyring: /usr/share/keyrings/1password-archive-keyring.gpg
state: present

- name: "[1PASSWORD] [DEB] install 1Password repository"
lineinfile:
path: /etc/apt/sources.list.d/1password.list
line: "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/amd64 beta main"
create: true
copy:
content: "deb [arch=amd64 signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/amd64 beta main"
dest: /etc/apt/sources.list.d/1password.list

- name: "[1PASSWORD] [DEB] install 1Password"
apt:
Expand Down
4 changes: 3 additions & 1 deletion roles/extra_software/tasks/tools/bat/bat_arch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

- name: "[BAT] [ARCH] Install bat"
pacman:
name: bat
name:
- bat
- bat-extras
state: present
update_cache: true
Loading

0 comments on commit 6aab972

Please sign in to comment.