Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
puppetpublic
base
Commits
25b13fcb
Commit
25b13fcb
authored
10 years ago
by
Adam Lewenberg
Browse files
Options
Downloads
Patches
Plain Diff
fix more @ issues in ERB files
parent
e49a0e30
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
NEWS
+8
-3
8 additions, 3 deletions
NEWS
templates/kerberos/krb5.conf.erb
+1
-1
1 addition, 1 deletion
templates/kerberos/krb5.conf.erb
templates/newsyslog/config.erb
+1
-1
1 addition, 1 deletion
templates/newsyslog/config.erb
templates/os/motd.erb
+1
-1
1 addition, 1 deletion
templates/os/motd.erb
with
11 additions
and
6 deletions
NEWS
+
8
−
3
View file @
25b13fcb
UNRELEASED (2015-03-??)
Fix a few more deprecation warnings concering instance variables
(i.e., add '@'s in ERB files) (adamhl)
release/004.031 (2015-03-02)
release/004.031 (2015-03-02)
Beginning of work to support RHEL-ish operating systems
Beginning of work to support RHEL-ish operating systems
such as CentOS and Oracle Linux. The most common change
such as CentOS and Oracle Linux. The most common change
involves converting 'operatingsystem' variable/fact usage
involves converting 'operatingsystem' variable/fact usage
to 'osfamily'. These changes were made safely as not to
to 'osfamily'. These changes were made safely as not to
potentially affect any existing hosts. There may be some
potentially affect any existing hosts. There may be some
additional refinements when CentOS and Oracle hosts come
additional refinements when CentOS and Oracle hosts come
online; for now, we're assuming they act identical to RHEL.
online; for now, we're assuming they act identical to RHEL.
Additionally modified puppetclient.pp to support version
Additionally modified puppetclient.pp to support version
locking of puppet and facter versions on RHEL systems.
locking of puppet and facter versions on RHEL systems.
Added one additional manifest to facilitate this.
Added one additional manifest to facilitate this.
...
...
This diff is collapsed.
Click to expand it.
templates/kerberos/krb5.conf.erb
+
1
−
1
View file @
25b13fcb
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
[realms]
[realms]
stanford.edu = {
stanford.edu = {
<%
if
drSite
==
"yes"
%>
kdc = kerberos-liv.stanford.edu:88
<%
if
@
drSite
==
"yes"
%>
kdc = kerberos-liv.stanford.edu:88
<%
end
%>
kdc = krb5auth1.stanford.edu:88
<%
end
%>
kdc = krb5auth1.stanford.edu:88
kdc = krb5auth2.stanford.edu:88
kdc = krb5auth2.stanford.edu:88
kdc = krb5auth3.stanford.edu:88
kdc = krb5auth3.stanford.edu:88
...
...
This diff is collapsed.
Click to expand it.
templates/newsyslog/config.erb
+
1
−
1
View file @
25b13fcb
...
@@ -5,7 +5,7 @@ set save = <%= @directory %>/OLD/%n
...
@@ -5,7 +5,7 @@ set save = <%= @directory %>/OLD/%n
set archive =
<%=
@archive
%>
/%Y/%M/%d/%m.%n
set archive =
<%=
@archive
%>
/%Y/%M/%d/%m.%n
<%
end
-%>
<%
end
-%>
<%=
name
%>
{
<%=
@
name
%>
{
<%
if
@stop
!=
''
then
-%>
<%
if
@stop
!=
''
then
-%>
stop:
<%=
@stop
%>
stop:
<%=
@stop
%>
<%
end
-%>
<%
end
-%>
...
...
This diff is collapsed.
Click to expand it.
templates/os/motd.erb
+
1
−
1
View file @
25b13fcb
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
host
=
@fqdn
.
downcase
host
=
@fqdn
.
downcase
product
=
productname
rescue
nil
product
=
@
productname
rescue
nil
if
product
.
nil?
if
product
.
nil?
product
=
"unknown"
product
=
"unknown"
else
else
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment