From c641fe08f26dce1c06ed61dc2d5a8b75486807fe Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 21 Nov 2016 21:58:09 -0500 Subject: Ignore non-existing locale.gen on init (#8649) --- bin/node_init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/node_init b/bin/node_init index b55cfed3..148ecc34 100755 --- a/bin/node_init +++ b/bin/node_init @@ -22,7 +22,7 @@ if ! egrep -q "$DEBIAN_VERSION" /etc/debian_version; then exit 1 fi mkdir -p $LEAP_DIR -if ! grep -q -e '^en_US.UTF-8' /etc/locale.gen; then +if ! grep -q -e '^en_US.UTF-8' /etc/locale.gen 2> /dev/null; then echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen /usr/sbin/locale-gen fi -- cgit v1.2.3 From cce9af1fce42c29bf062cccfc46ef356d83a6328 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 23 Feb 2017 11:42:47 +0100 Subject: [8144] Remove Haproxy We used haproxy because we had multiple bigcouch nodes but now with a single couchdb node this is not needed anymore. - Resolves: #8144 --- bin/debug.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/debug.sh b/bin/debug.sh index d6f37542..35bcfa3e 100755 --- a/bin/debug.sh +++ b/bin/debug.sh @@ -2,7 +2,7 @@ # debug script to be run on remote servers # called from leap_cli with the 'leap debug' cmd -apps='(leap|pixelated|stunnel|couch|soledad|haproxy)' +apps='(leap|pixelated|stunnel|couch|soledad)' facts='(apt_running |^architecture |^augeasversion |^couchdb_.* |^debian_.* |^dhcp_enabled |^domain |^facterversion |^filesystems |^fqdn |^hardwaremodel |^hostname |^interface.* |^ipaddress.* |^is_pe |^is_virtual |^kernel.* |^lib |^lsb.* |^memory.* |^mtu_.* |^netmask.* |^network_.* |^operatingsystem |^os.* |^path |^physicalprocessorcount |^processor.* |^ps |^puppetversion |^root_home |^rsyslog_version |^rubysitedir |^rubyversion |^selinux |^ssh_version |^swapfree.* |^swapsize.* |^type |^virtual)' @@ -24,6 +24,3 @@ ps aux|egrep "$apps" echo -e '\n\n' echo -e "Last deploy:\n" tail -2 /var/log/leap/deploy-summary.log - - - -- cgit v1.2.3 From 26be1f84de9efabf5fec1278401ae0c5538454d9 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Fri, 19 May 2017 23:41:57 +0200 Subject: makes sure locales packages is installed before locale-gen fixes #8649 --- bin/node_init | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/node_init b/bin/node_init index 148ecc34..e86374b6 100755 --- a/bin/node_init +++ b/bin/node_init @@ -22,10 +22,6 @@ if ! egrep -q "$DEBIAN_VERSION" /etc/debian_version; then exit 1 fi mkdir -p $LEAP_DIR -if ! grep -q -e '^en_US.UTF-8' /etc/locale.gen 2> /dev/null; then - echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen - /usr/sbin/locale-gen -fi # # UPDATE PACKAGES @@ -83,6 +79,12 @@ if [[ $exit_code -ne 0 ]]; then exit $exit_code fi +# need to have the locales package from above +if ! grep -q -e '^en_US.UTF-8' /etc/locale.gen 2> /dev/null; then + echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen + /usr/sbin/locale-gen +fi + # # FINALIZE # -- cgit v1.2.3 From f93953299044ffa0154c08368ecb91b7a3f08a93 Mon Sep 17 00:00:00 2001 From: kwadronaut Date: Sat, 20 May 2017 00:20:08 +0200 Subject: generate missing ssh host keys on node init (closes #8790) closes #8414 as well --- bin/node_init | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'bin') diff --git a/bin/node_init b/bin/node_init index 148ecc34..66dc17e7 100755 --- a/bin/node_init +++ b/bin/node_init @@ -89,3 +89,8 @@ fi mkdir -p $HIERA_DIR chmod 0755 $HIERA_DIR touch $INIT_FILE + +# Sometimes not all keys are already generated, happens more often +# with VMs +# that would give us errors in the get_ssh_keys_cmd during node init +/usr/bin/ssh-keygen -A -- cgit v1.2.3 From 1653a99d5f70a68f59fea2c1d2eea40447e8a466 Mon Sep 17 00:00:00 2001 From: Varac Date: Thu, 16 Nov 2017 18:30:09 +0100 Subject: CI: Show LEAP apt source --- bin/debug.sh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'bin') diff --git a/bin/debug.sh b/bin/debug.sh index 35bcfa3e..4f29f300 100755 --- a/bin/debug.sh +++ b/bin/debug.sh @@ -12,6 +12,10 @@ export FACTERLIB="/srv/leap/puppet/modules/apache/lib/facter:/srv/leap/puppet/mo facter 2>/dev/null | egrep -i "$facts" +# show leap debian repo used +echo -e '\n\n' +cat /etc/apt/sources.list.d/leap*.list + # query installed versions echo -e '\n\n' dpkg -l | egrep "$apps" -- cgit v1.2.3 From bf6c56d86c7ba45e7ca766d990a9e9162025e5ac Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 27 Nov 2017 10:53:13 -0800 Subject: run_tests - use byebug instead of debugger --- bin/run_tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/run_tests b/bin/run_tests index 8450a9bf..241a3fa2 100755 --- a/bin/run_tests +++ b/bin/run_tests @@ -507,7 +507,7 @@ end if ARGV.include?('--debug') || ARGV.include?('-d') DEBUG=true - require 'debugger' + require 'byebug' else DEBUG=false end -- cgit v1.2.3