-
Notifications
You must be signed in to change notification settings - Fork 180
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use absolute in paths in salt scripts
- Loading branch information
Showing
29 changed files
with
92 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 18 additions & 18 deletions
36
susemanager-utils/susemanager-sls/salt/packages/redhatproductinfo.sls
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,38 @@ | ||
| {% if grains['os_family'] == 'RedHat' %} | ||
| rhelrelease: | ||
| cmd.run: | ||
| - name: cat /etc/redhat-release | ||
| - onlyif: test -f /etc/redhat-release -a ! -L /etc/redhat-release | ||
| - name: /usr/bin/cat /etc/redhat-release | ||
| - onlyif: /usr/bin/test -f /etc/redhat-release -a ! -L /etc/redhat-release | ||
| alibabarelease: | ||
| cmd.run: | ||
| - name: cat /etc/alinux-release | ||
| - onlyif: test -f /etc/alinux-release | ||
| - name: /usr/bin/cat /etc/alinux-release | ||
| - onlyif: /usr/bin/test -f /etc/alinux-release | ||
| centosrelease: | ||
| cmd.run: | ||
| - name: cat /etc/centos-release | ||
| - onlyif: test -f /etc/centos-release | ||
| - name: /usr/bin/cat /etc/centos-release | ||
| - onlyif: /usr/bin/test -f /etc/centos-release | ||
| oraclerelease: | ||
| cmd.run: | ||
| - name: cat /etc/oracle-release | ||
| - onlyif: test -f /etc/oracle-release | ||
| - name: /usr/bin/cat /etc/oracle-release | ||
| - onlyif: /usr/bin/test -f /etc/oracle-release | ||
| amazonrelease: | ||
| cmd.run: | ||
| - name: cat /etc/system-release | ||
| - onlyif: test -f /etc/system-release && grep -qi Amazon /etc/system-release | ||
| - name: /usr/bin/cat /etc/system-release | ||
| - onlyif: /usr/bin/test -f /etc/system-release && grep -qi Amazon /etc/system-release | ||
| almarelease: | ||
| cmd.run: | ||
| - name: cat /etc/almalinux-release | ||
| - onlyif: test -f /etc/almalinux-release | ||
| - name: /usr/bin/cat /etc/almalinux-release | ||
| - onlyif: /usr/bin/test -f /etc/almalinux-release | ||
| rockyrelease: | ||
| cmd.run: | ||
| - name: cat /etc/rocky-release | ||
| - onlyif: test -f /etc/rocky-release | ||
| - name: /usr/bin/cat /etc/rocky-release | ||
| - onlyif: /usr/bin/test -f /etc/rocky-release | ||
| respkgquery: | ||
| cmd.run: | ||
| - name: rpm -q --whatprovides 'sles_es-release-server' | ||
| - onlyif: rpm -q --whatprovides 'sles_es-release-server' | ||
| - name: /usr/bin/rpm -q --whatprovides 'sles_es-release-server' | ||
| - onlyif: /usr/bin/rpm -q --whatprovides 'sles_es-release-server' | ||
| sllpkgquery: | ||
| cmd.run: | ||
| - name: rpm -q --whatprovides 'sll-release' | ||
| - onlyif: rpm -q --whatprovides 'sll-release' | ||
| - name: /usr/bin/rpm -q --whatprovides 'sll-release' | ||
| - onlyif: /usr/bin/rpm -q --whatprovides 'sll-release' | ||
| {% endif %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 10 additions & 10 deletions
20
susemanager-utils/susemanager-sls/salt/srvmonitoring/removejmxprops.sls
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| remove_{{remove_jmx_props.service}}_jmx_host: | ||
| cmd.run: | ||
| - name: sed -ri 's/JAVA_OPTS="(.*)-Dcom\.sun\.management\.jmxremote\.host=\S*(.*)"/JAVA_OPTS="\1 \2"/' {{remove_jmx_props.file}} | ||
| - onlyif: grep -F -- '-Dcom.sun.management.jmxremote.host=' {{remove_jmx_props.file}} | ||
| - name: /usr/bin/sed -ri 's/JAVA_OPTS="(.*)-Dcom\.sun\.management\.jmxremote\.host=\S*(.*)"/JAVA_OPTS="\1 \2"/' {{remove_jmx_props.file}} | ||
| - onlyif: /usr/bin/grep -F -- '-Dcom.sun.management.jmxremote.host=' {{remove_jmx_props.file}} | ||
|
|
||
| remove_{{remove_jmx_props.service}}_jmx_port: | ||
| cmd.run: | ||
| - name: sed -ri 's/JAVA_OPTS="(.*)-Dcom\.sun\.management\.jmxremote\.port=[0-9]*(.*)"/JAVA_OPTS="\1 \2"/' {{remove_jmx_props.file}} | ||
| - onlyif: grep -E -- '-Dcom\.sun\.management\.jmxremote\.port=[0-9]+' {{remove_jmx_props.file}} | ||
| - name: /usr/bin/sed -ri 's/JAVA_OPTS="(.*)-Dcom\.sun\.management\.jmxremote\.port=[0-9]*(.*)"/JAVA_OPTS="\1 \2"/' {{remove_jmx_props.file}} | ||
| - onlyif: /usr/bin/grep -E -- '-Dcom\.sun\.management\.jmxremote\.port=[0-9]+' {{remove_jmx_props.file}} | ||
| remove_{{remove_jmx_props.service}}_jmx_ssl: | ||
| cmd.run: | ||
| - name: sed -i 's/JAVA_OPTS="\(.*\)-Dcom\.sun\.management\.jmxremote\.ssl=false\(.*\)"/JAVA_OPTS="\1 \2"/' {{remove_jmx_props.file}} | ||
| - onlyif: grep -F -- '-Dcom.sun.management.jmxremote.ssl=false' {{remove_jmx_props.file}} | ||
| - name: /usr/bin/sed -i 's/JAVA_OPTS="\(.*\)-Dcom\.sun\.management\.jmxremote\.ssl=false\(.*\)"/JAVA_OPTS="\1 \2"/' {{remove_jmx_props.file}} | ||
| - onlyif: /usr/bin/grep -F -- '-Dcom.sun.management.jmxremote.ssl=false' {{remove_jmx_props.file}} | ||
|
|
||
| remove_{{remove_jmx_props.service}}_jmx_auth: | ||
| cmd.run: | ||
| - name: sed -i 's/JAVA_OPTS="\(.*\)-Dcom\.sun\.management\.jmxremote\.authenticate=false\(.*\)"/JAVA_OPTS="\1 \2"/' {{remove_jmx_props.file}} | ||
| - onlyif: grep -F -- '-Dcom.sun.management.jmxremote.authenticate=false' {{remove_jmx_props.file}} | ||
| - name: /usr/bin/sed -i 's/JAVA_OPTS="\(.*\)-Dcom\.sun\.management\.jmxremote\.authenticate=false\(.*\)"/JAVA_OPTS="\1 \2"/' {{remove_jmx_props.file}} | ||
| - onlyif: /usr/bin/grep -F -- '-Dcom.sun.management.jmxremote.authenticate=false' {{remove_jmx_props.file}} | ||
|
|
||
| remove_{{remove_jmx_props.service}}_jmx_hostname: | ||
| cmd.run: | ||
| - name: sed -ri 's/JAVA_OPTS="(.*)-Djava\.rmi\.server\.hostname=\S*(.*)"/JAVA_OPTS="\1 \2"/' {{remove_jmx_props.file}} | ||
| - onlyif: grep -F -- '-Djava.rmi.server.hostname=' {{remove_jmx_props.file}} | ||
| - name: /usr/bin/sed -ri 's/JAVA_OPTS="(.*)-Djava\.rmi\.server\.hostname=\S*(.*)"/JAVA_OPTS="\1 \2"/' {{remove_jmx_props.file}} | ||
| - onlyif: /usr/bin/grep -F -- '-Djava.rmi.server.hostname=' {{remove_jmx_props.file}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.