Page MenuHomeDevCentral
Files F3632134

D3488.diff
No OneTemporary
Actions

D3488.diff
View Options

diff --git a/roles/core/init.sls b/roles/core/init.sls
--- a/roles/core/init.sls
+++ b/roles/core/init.sls
@@ -15,7 +15,6 @@
- .monitoring
- .motd
- .ntp
- - .src
- .rsyslog
- .salt
- .sshd
@@ -29,3 +28,6 @@
# Depends of users or groups
- .deploy
- .userland-home
+
+ # Depends of software (git)
+ - .src
diff --git a/roles/core/src/init.sls b/roles/core/src/init.sls
--- a/roles/core/src/init.sls
+++ b/roles/core/src/init.sls
@@ -10,11 +10,6 @@
{% set version = grains['kernelrelease'].split("-")[0] %}
-{% if version >= "13.0" %}
-git:
- pkg.installed
-{% endif %}
-
freebsd_src:
cmd.run:
{% if version < "13.0" %}
diff --git a/roles/core/userland-software/base.sls b/roles/core/userland-software/base.sls
--- a/roles/core/userland-software/base.sls
+++ b/roles/core/userland-software/base.sls
@@ -78,6 +78,7 @@
- pkgs:
- bat
- colordiff
+ - git
- nano
- ripgrep
- tree
@@ -113,6 +114,14 @@
- mode: 755
{% endif %}
+/root/.gitconfig:
+ file.managed:
+ - source: salt://roles/core/userland-software/files/gitconfig
+ - replace: False
+ - user: root
+ - group: 0
+ - mode: 444
+
# -------------------------------------------------------------
# Nano configuration
#
diff --git a/roles/core/userland-software/files/gitconfig b/roles/core/userland-software/files/gitconfig
new file mode 100644
--- /dev/null
+++ b/roles/core/userland-software/files/gitconfig
@@ -0,0 +1,22 @@
+# -------------------------------------------------------------
+# Git :: configuration :: root user
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# Source file: roles/core/userland-software/files/gitconfig
+# -------------------------------------------------------------
+#
+# <auto-generated>
+# This file is managed by our rOPS SaltStack repository.
+#
+# Changes to this file may cause incorrect behavior
+# and will be lost if the state is redeployed.
+# </auto-generated>
+
+[user]
+ name = Nasqueron Operations SIG
+ email = ops@nasqueron.org
+[core]
+ editor = nano
+[pull]
+ rebase = true
diff --git a/roles/paas-docker/devel/software.sls b/roles/paas-docker/devel/software.sls
--- a/roles/paas-docker/devel/software.sls
+++ b/roles/paas-docker/devel/software.sls
@@ -15,7 +15,6 @@
docker_development_utilities:
pkg.installed:
- pkgs:
- - git
- jq
- {{ packages_prefixes.python3 }}pip
- sqlite
diff --git a/roles/saas-mediawiki/software/init.sls b/roles/saas-mediawiki/software/init.sls
--- a/roles/saas-mediawiki/software/init.sls
+++ b/roles/saas-mediawiki/software/init.sls
@@ -17,7 +17,6 @@
- pkgs:
- {{ packages.exiftool }}
- exiv2
- - git
- {{ packages.imagemagick }}
- {{ packages['jpeg-turbo'] }}
- librsvg2
diff --git a/roles/shellserver/userland-software/base.sls b/roles/shellserver/userland-software/base.sls
--- a/roles/shellserver/userland-software/base.sls
+++ b/roles/shellserver/userland-software/base.sls
@@ -104,7 +104,6 @@
- {{ packages.bats }}
- cmake
- {{ packages.cppunit }}
- - git
- git-lfs
- jq
- valgrind
diff --git a/roles/webserver-alkane/alkane/init.sls b/roles/webserver-alkane/alkane/init.sls
--- a/roles/webserver-alkane/alkane/init.sls
+++ b/roles/webserver-alkane/alkane/init.sls
@@ -36,7 +36,6 @@
pkg.installed:
- pkgs:
- {{ packages.composer }}
- - git
- jq
- yarn

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 7, 19:28 (20 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2180962
Default Alt Text
D3488.diff (3 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator