diff options
| author | bnewbold <bnewbold@robocracy.org> | 2016-04-09 22:44:28 -0400 |
|---|---|---|
| committer | bnewbold <bnewbold@robocracy.org> | 2016-04-09 22:44:31 -0400 |
| commit | 714f726bb31f4bad12b71846d2ee0b03ccf67f3a (patch) | |
| tree | a077bc54f49839e69d2fab7fcd760157688555f2 /roles/common | |
| parent | e9084254447d25480fac3818d042175d716db48f (diff) | |
| download | infra-714f726bb31f4bad12b71846d2ee0b03ccf67f3a.tar.gz infra-714f726bb31f4bad12b71846d2ee0b03ccf67f3a.zip | |
common: small changes
- add tree and linux-util
- rename "extras" to "extrapkg"
- add a gitconfig for root (for etckeeper)
Diffstat (limited to 'roles/common')
| -rw-r--r-- | roles/common/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/common/tasks/extrapkg.yml (renamed from roles/common/tasks/extras.yml) | 5 | ||||
| -rw-r--r-- | roles/common/tasks/main.yml | 9 | ||||
| -rw-r--r-- | roles/common/templates/root_gitconfig.j2 | 5 |
4 files changed, 18 insertions, 2 deletions
diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml index 22287b0..642f58e 100644 --- a/roles/common/defaults/main.yml +++ b/roles/common/defaults/main.yml @@ -4,6 +4,7 @@ # This is a reference of all the variables. ############################################################################### +hostname_fqdn: "{{ ansible_fqdn }}" common_timezone: 'Etc/UTC' # domain: (required) # main_user_name: (required) diff --git a/roles/common/tasks/extras.yml b/roles/common/tasks/extrapkg.yml index 9a4bd2f..0836912 100644 --- a/roles/common/tasks/extras.yml +++ b/roles/common/tasks/extrapkg.yml @@ -2,11 +2,16 @@ - name: Install extras that Everybody wants apt: pkg={{ item }} state=installed with_items: + - ack-grep + - alpine - build-essential - cowsay + - ctorrent - figlet - ipython - ipython3 + - lynx + - manpages-dev tags: - dependencies diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 58b71b2..a4818b0 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -57,15 +57,17 @@ - screen - sudo - tcpdump + - tree - unzip - unattended-upgrades + - util-linux - vim-nox - wget tags: - dependencies - name: Create /srv directory - file: path=/src/http/cgit + file: path=/srv state=directory owner=root group=root @@ -91,7 +93,10 @@ - name: Apticron email configuration template: src=apticron.conf.j2 dest=/etc/apticron/apticron.conf +- name: gitconfig for root user (etckeeper will complain) + template: src=root_gitconfig.j2 dest=/root/.gitconfig + #- include: users.yml tags=users - include: security.yml tags=security - include: ntp.yml tags=ntp -- include: extras.yml tags=extras +- include: extrapkg.yml tags=extrapkg diff --git a/roles/common/templates/root_gitconfig.j2 b/roles/common/templates/root_gitconfig.j2 new file mode 100644 index 0000000..90c7151 --- /dev/null +++ b/roles/common/templates/root_gitconfig.j2 @@ -0,0 +1,5 @@ + git config --global user.name "Your Name" + git config --global user.email you@example.com +[user] + name = root + email = root@{{ hostname_fqdn }} |