Skip to content

Commit

Permalink
Merge branch 'release/1.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
lueschem committed Mar 18, 2020
2 parents 8716da5 + 6382205 commit a4d9fee
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 6 deletions.
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
edi (1.3.0) bionic; urgency=medium

[ Matthias Lüscher ]
* Allow default user without password.

-- Matthias Lüscher (Launchpad) <m.luescher@datacomm.ch> Wed, 18 Mar 2020 18:07:27 +0100

edi (1.2.1) bionic; urgency=medium

[ Matthias Lüscher ]
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
# built documents.
#
# The short X.Y version.
version = '1.2.1'
release = '1.2.1'
version = '1.3.0'
release = '1.3.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
8 changes: 7 additions & 1 deletion docs/config_management/plugins.rst
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,13 @@ The default user can be fine tuned as follows:
- The groups of the default user (default is :code:`adm,sudo`).
* - default_user_password
- The initially set password of the default user
(default is :code:`ChangeMe!`).
(default is :code:`ChangeMe!`). You can `adjust this password`_ if needed.
Set this password to :code:`"*"` if
you would like to disable password based login. Please note that
the playbook will then automatically create a sudoers file to not
impair the :code:`sudo` command.

.. _adjust this password: https://docs.ansible.com/ansible/latest/reference_appendices/faq.html#how-do-i-generate-encrypted-passwords-for-the-user-module

Base System Cleanup
^^^^^^^^^^^^^^^^^^^
Expand Down
2 changes: 1 addition & 1 deletion edi/lib/versionhelpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

# The do_release script will update this version!
# During launchpad debuild neither the git version nor the package version is available.
edi_fallback_version = '1.2.1'
edi_fallback_version = '1.3.0'


def get_edi_version():
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
append: yes
update_password: on_create

- name: Enable sudo without password for the default user.
template:
src: no_passwd
dest: /etc/sudoers.d/{{ default_user_name }}
when: "'sudo' in default_user_groups.replace(' ', '').split(',') and default_user_password == '*'"

- name: Set up authorized keys for current user.
authorized_key:
user: '{{ default_user_name }}'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{{ default_user_name }} ALL=(ALL) NOPASSWD: ALL
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
gid: "{{ enforced_gid | default(omit) }}"
state: present

- name: Add the current user (password=ChangeMe!).
- name: Add the current user.
user:
name: "{{ edi_current_user_name }}"
group: "{{ edi_current_user_group_name }}"
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
setup(
name='edi',

version='1.2.1',
version='1.3.0',

description='Embedded Development Infrastructure - edi',
long_description=long_description,
Expand Down

0 comments on commit a4d9fee

Please sign in to comment.