Merge branch 'ansible'
This commit is contained in:
commit
b78b064343
4 changed files with 4 additions and 36 deletions
9
.gitmodules
vendored
9
.gitmodules
vendored
|
@ -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
|
|
|
@ -1,4 +0,0 @@
|
||||||
--fail-on-warnings
|
|
||||||
--no-arrow-alignment-check
|
|
||||||
--no-documentation-check
|
|
||||||
--no-variables_not_enclosed-check
|
|
|
@ -1,14 +1,14 @@
|
||||||
# dotfiles
|
# Dotfiles
|
||||||
|
|
||||||
[![CircleCI](https://circleci.com/gh/RealOrangeOne/dotfiles.svg?style=svg)](https://circleci.com/gh/RealOrangeOne/dotfiles)
|
[![CircleCI](https://circleci.com/gh/RealOrangeOne/dotfiles.svg?style=svg)](https://circleci.com/gh/RealOrangeOne/dotfiles)
|
||||||
|
|
||||||
Settings and Preferences for transfer between machines
|
Settings and Preferences for transfer between machines
|
||||||
|
|
||||||
## Requirements
|
## Requirements
|
||||||
- `puppet`
|
- `pipenv`
|
||||||
- `~/.dotfiles` repo from private
|
- Correctly setup `~/.dotfiles` directory
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
1. run `deploy.sh` as root
|
1. Run `pipenv run deploy`
|
||||||
2. ???
|
2. ???
|
||||||
3. Profit!
|
3. Profit!
|
||||||
|
|
|
@ -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
|
|
Loading…
Reference in a new issue