Merge branch 'ansible'

This commit is contained in:
Jake Howard 2018-09-17 16:13:41 +01:00
commit b78b064343
Signed by: jake
GPG key ID: 57AFB45680EDD477
4 changed files with 4 additions and 36 deletions

9
.gitmodules vendored
View file

@ -1,9 +0,0 @@
[submodule "modules/vcsrepo"]
path = modules/vcsrepo
url = https://github.com/puppetlabs/puppetlabs-vcsrepo
[submodule "modules/concat"]
path = modules/concat
url = https://github.com/puppetlabs/puppetlabs-concat
[submodule "modules/stdlib"]
path = modules/stdlib
url = https://github.com/puppetlabs/puppetlabs-stdlib

View file

@ -1,4 +0,0 @@
--fail-on-warnings
--no-arrow-alignment-check
--no-documentation-check
--no-variables_not_enclosed-check

View file

@ -1,14 +1,14 @@
# dotfiles
# Dotfiles
[![CircleCI](https://circleci.com/gh/RealOrangeOne/dotfiles.svg?style=svg)](https://circleci.com/gh/RealOrangeOne/dotfiles)
Settings and Preferences for transfer between machines
## Requirements
- `puppet`
- `~/.dotfiles` repo from private
- `pipenv`
- Correctly setup `~/.dotfiles` directory
## Usage
1. run `deploy.sh` as root
1. Run `pipenv run deploy`
2. ???
3. Profit!

View file

@ -1,19 +0,0 @@
*** /usr/bin/makepkg 2018-05-29 09:10:22.097063834 +0100
--- /usr/bin/makepkg.orig 2018-05-29 09:08:25.916705962 +0100
***************
*** 1403,1409 ****
if (( EUID == 0 )); then
error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\
catastrophic damage to your system.")" "makepkg"
! # exit $E_ROOT
fi
else
if [[ -z $FAKEROOTKEY ]]; then
--- 1403,1409 ----
if (( EUID == 0 )); then
error "$(gettext "Running %s as root is not allowed as it can cause permanent,\n\
catastrophic damage to your system.")" "makepkg"
! exit $E_ROOT
fi
else
if [[ -z $FAKEROOTKEY ]]; then