Skip to content

Commit cb80c41

Browse files
raupulusraupulus
authored
Merge pull request #201 from fryntiz/dev
Mejoras y correcciones para versión 0.8.10
2 parents fefe433 + 5874f61 commit cb80c41

File tree

18 files changed

+82
-13
lines changed

18 files changed

+82
-13
lines changed

‎Apps/IDEs/phpstorm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ phpstorm_postconfiguracion() {
7575
}
7676

7777
phpstorm_instalador() {
78-
local version='PhpStorm-2019.3.4'
78+
local version='PhpStorm-2020.1.2'
7979

8080
echo -e "$VE Comenzando instalación de$RO PhpStorm$CL"
8181

‎Apps/IDEs/pycharm_pro.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@ pycharm_instalar() {
5353
echo -e "$VE Extrayendo IDE$CL"
5454
cd "$WORKSCRIPT/tmp/" || return 0
5555
tar -zxf "${1}.tar.gz" 2>> /dev/null
56+
5657
local directorio="$(ls | grep -E ^pycharm.+[^\.tar\.gz]$)"
57-
ls
58+
5859
if [[ "$directorio" != '' ]]; then
5960
mv "$WORKSCRIPT/tmp/$directorio" "$HOME/.local/opt/pycharm"
6061
fi
62+
6163
cd "$WORKSCRIPT" || exit 1
6264
}
6365

@@ -72,7 +74,7 @@ pycharm_postconfiguracion() {
7274
}
7375

7476
pycharm_pro_instalador() {
75-
local version='pycharm-professional-2019.3.4'
77+
local version='pycharm-professional-2020.1.2'
7678

7779
echo -e "$VE Comenzando instalación de$RO PyCharm$CL"
7880

‎Lenguajes-Programacion/php.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ php_postconfiguracion() {
113113
fi
114114

115115
if [[ ! -f "$WORKSCRIPT/tmp/psysh" ]]; then
116-
descargar 'psysh' 'https://git.io/psysh'
116+
descargar 'psysh' 'https://psysh.org/psysh'
117117
fi
118118

119119
cp "$WORKSCRIPT/tmp/psysh" "$HOME/.local/bin/psysh"

‎Repositorios/debian/comunes.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ comunes_agregar_llaves() {
9494

9595
## Repositorio para editor VS Codium.
9696
echo -e "$VE Agregando clave para el editor$RO VS Codium$CL"
97-
wget -qO - https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg | sudo apt-key add -
97+
wget -qO - https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg | gpg --dearmor | sudo dd of=/etc/apt/trusted.gpg.d/vscodium-archive-keyring.gpg
98+
sudo chmod ugo+r /etc/apt/trusted.gpg.d/vscodium-archive-keyring.gpg
9899

99100
## Google Earth
100101
echo -e "$VE Agregando clave para $RO Google Earth$CL"
@@ -130,6 +131,12 @@ comunes_agregar_llaves() {
130131

131132
## Any Desk
132133
wget -qO - https://keys.anydesk.com/repos/DEB-GPG-KEY | sudo apt-key add -
134+
135+
## GO CD (Desarrollo continuo)
136+
curl https://download.gocd.org/GOCD-GPG-KEY.asc | sudo apt-key add -
137+
138+
## Jenkins
139+
wget -q -O - https://pkg.jenkins.io/debian-stable/jenkins.io.key | sudo apt-key add -
133140
}
134141

135142
##

‎Repositorios/debian/comunes/sources.list.d/gocd.list

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
########################################################
2+
## GOCD ##
3+
########################################################
4+
deb https://download.gocd.org /

‎Repositorios/debian/comunes/sources.list.d/jenkins.list

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
########################################################
2+
## JENKINS ##
3+
########################################################
4+
5+
deb https://pkg.jenkins.io/debian-stable binary/

‎Repositorios/debian/comunes/sources.list.d/virtualbox.list

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
########################################################
44
# curl -O https://www.virtualbox.org/download/oracle_vbox_2016.asc
55
# sudo apt-key add oracle_vbox_2016.asc
6-
deb http://download.virtualbox.org/virtualbox/debian stretch contrib
6+
deb http://download.virtualbox.org/virtualbox/debian buster contrib

‎Repositorios/debian/comunes/sources.list.d/vscodium.list

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
deb https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/repos/debs/ vscodium main
1+
deb [signed-by=/etc/apt/trusted.gpg.d/vscodium-archive-keyring.gpg] https://paulcarroty.gitlab.io/vscodium-deb-rpm-repo/debs/ vscodium main

‎Repositorios/debian/stable/sources.list.d/liquorix.list

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
########################################################
2+
## KERNEL LIQUORIX ##
3+
########################################################
4+
## curl https://liquorix.net/linux-liquorix.pub | sudo apt-key add - && sudo apt-get update
5+
## sudo apt-get install linux-image-liquorix-amd64 linux-headers-liquorix-amd64
6+
# deb http://liquorix.net/debian stable main
7+
# deb-src http://liquorix.net/debian stable main

‎Repositorios/debian/testing/sources.list.d/liquorix.list

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
## KERNEL LIQUORIX ##
33
########################################################
44
#### curl https://liquorix.net/linux-liquorix.pub | sudo apt-key add - && sudo apt-get update
5-
# deb http://liquorix.net/debian sid main
6-
# deb-src http://liquorix.net/debian sid main
5+
# deb http://liquorix.net/debian testing main
6+
# deb-src http://liquorix.net/debian testing main

‎Servidores/postgreSQL.sh

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,47 @@ postgresql_postconfiguracion() {
5858

5959
echo -e "$VE Estableciendo timezone = 'UTC'$CL"
6060
sudo sed -r -i "s/^\s*#?timezone\s*=.*/timezone = 'UTC'/" "$POSTGRESCONF"
61+
62+
63+
local PGHBA="/etc/postgresql/$V_PSQL/main/pg_hba.conf"
64+
echo -e "$VE Archivo de configuración$RO $PGHBA$CL"
65+
66+
## Permito conectar todos los usuarios en entorno local.
67+
sudo sed -r -i "s/^\s*#?local\s*all\s*all\s*peer/local all all trust/" "$PGHBA"
6168
done
6269
}
6370

6471
personalizar_postgresql() {
6572
echo -e "$VE Personalizando$RO postgreSQL$CL"
66-
#sudo -u postgres createdb basedatos #Crea la base de datos basedatos
67-
#sudo -u postgres createuser -P usuario #Crea el usuario usuario y pide que teclee su contraseña
73+
}
74+
75+
postgresql_users_create() {
76+
echo -e "$VE Crear usuario desarrollador$RO dev$CL"
77+
78+
## Crea el usuario usuario y pide que teclee su contraseña.
79+
sudo -u postgres createuser -P dev
80+
81+
## Crea la base de datos basedatos para el usuario.
82+
sudo -u postgres createdb dev -O dev
83+
84+
## Creo la base de datos para almacenar información del sistema.
85+
sudo -u postgres createdb computer -O dev
86+
87+
## Asigno permisos para el usuario dev en las DB creadas.
88+
sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE dev to dev"
89+
sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE computer to dev"
6890
}
6991

7092
configurar_postgresql
7193
personalizar_postgresql
94+
95+
if [[ $MY_ENV = 'dev' ]]; then
96+
read -p '¿Quieres crear usuario desarrollador? s/N → ' input
97+
98+
if [[ $input = 's' ]] || [[ $input = 'S' ]]; then
99+
postgresql_users_create
100+
fi
101+
fi
72102
}
73103

74104
postgresql_instalador() {

‎Software-Lists/debian/Basico/terminal.lst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ tmux-plugin-manager
1010
powerline
1111
xterm
1212
colord
13+
pssh

‎Software-Lists/debian/Desarrollo/comandos.lst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
editorconfig
22
pandoc
33
shellcheck
4+
gitlab-cli
5+
gitk
6+
git-gui
7+
git-ftp

‎Software-Lists/debian/Vps/basico.lst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
git
2+
gitlab-cli
3+
pssh
4+
ssh

‎VPS/firewall.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
mainFirewall() {
55
## Comprobar que existe firewall-cmd
66

7+
sudo systemctl start firewalld
8+
79
## Permito ssh
810
sudo firewall-cmd --zone=public --add-port=22/tcp --permanent
911

‎conf/home/.local/bin/actualizar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ actualizarSistema() {
5050
if [[ -f '/usr/bin/pip' ]] || [[ -f "$HOME/.local/bin/pip" ]]; then
5151
echo "Actualizando desde PIP Python 2"
5252
#pip-review --local --auto
53-
python -m pip_review --local --auto
53+
python2 -m pip_review --local --auto
5454
fi
5555

5656
if [[ -f '/usr/bin/pip3' ]] || [[ -f "$HOME/.local/bin/pip3" ]]; then

‎main-vps.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ fi
4343
chown web:web -R /home/web/debian-developer-conf
4444
cd /home/web/debian-developer-conf || exit
4545

46+
## TODO → Con el "all" ya es suficiente, pero es necesario comprobar que exista
47+
## la línea ya que al volver a ejecutar script o en algunos servidores ya se
48+
## encuentra y produce problemas después con firewalld u otros cortafuegos.
49+
4650
# Desactivar ipv6 por completo
4751
echo 'net.ipv6.conf.all.disable_ipv6=1' >> '/etc/sysctl.conf'
4852
echo 'net.ipv6.conf.default.disable_ipv6=1' >> '/etc/sysctl.conf'

‎main.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if [[ -a "$WORKSCRIPT/.env" ]]; then
5353
fi
5454

5555
USER=$(whoami) ## Usuario que ejecuta el script
56-
VERSION='0.8.9' ## Versión en desarrollo
56+
VERSION='0.8.10' ## Versión en desarrollo
5757
MY_DISTRO="$DISTRO" ## Distribución sobre la que se ejecuta
5858
MY_BRANCH="$BRANCH" ## stable|testing|unstable
5959
MY_ENV="$ENV" ## prod|dev desde /etc/environment o .env

0 commit comments

Comments
 (0)