puppetfactory 0.6.3 → 0.6.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +88 -0
- data/lib/puppetfactory/plugins/gitea.rb +2 -1
- data/public/css/style.css +3 -1
- data/views/currentuser.erb +2 -1
- data/views/index.erb +3 -3
- data/views/shell.erb +3 -3
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 38a7e8adf9316dfd8228109df2fdf418988cb1cf
|
4
|
+
data.tar.gz: d860112658d89746e951733c69edac617bf6d862
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ba9b43f391a6d3e9e9bb5dc469ff63fe368c592a77ffa986dd542a5707afb4843d54c82989dfaf2742b905710ff1fd4be9c022f27d59bafc6f93d9b1c7c21ed2
|
7
|
+
data.tar.gz: e44cd56760233534a617db20435a84f13f57f9a3ba347cb35058255c722fdbb567b6759140bb9e8109e2eaf7c6b5f8b16287884fd59e143fec27ac671e656539
|
data/CHANGELOG.md
ADDED
@@ -0,0 +1,88 @@
|
|
1
|
+
# v0.6.4
|
2
|
+
* Corrected some UI artifacts.
|
3
|
+
* Display username in alternate login section.
|
4
|
+
* Add upstream parameter for Gitea configuration.
|
5
|
+
* Restored *deploy* button spinner.
|
6
|
+
* Restored missing Gitviz tab.
|
7
|
+
|
8
|
+
# v0.6.3
|
9
|
+
* Set server timeout property correctly
|
10
|
+
* UI/UX fixes
|
11
|
+
* Fixed user login/logout issues
|
12
|
+
* Upgrade JQuery to Latest stable
|
13
|
+
|
14
|
+
# v0.6.2
|
15
|
+
* Correct user login crasher
|
16
|
+
|
17
|
+
# v0.6.1
|
18
|
+
* Fix user selection bug
|
19
|
+
* Ensure that the gitea admin's .ssh directory exists
|
20
|
+
|
21
|
+
# v0.6.0
|
22
|
+
* Major UI overhaul--single page interface for users
|
23
|
+
* More robust user management
|
24
|
+
* Remove race conditions with Gitea integration
|
25
|
+
* Made it much less likely for users to get raw html error dialogs when provisioning
|
26
|
+
* Removed some minor shell injection vulnerabilities
|
27
|
+
* Stopped mapping the yum repo directory, so no more extraneous permission changes from pe_repo
|
28
|
+
|
29
|
+
# v0.5.9
|
30
|
+
* Add link to Gitea when enabled
|
31
|
+
* Correct caching issue with IE preventing users from deploying code
|
32
|
+
* Corrected bug causing user sessions to be lost
|
33
|
+
* Minor style changes
|
34
|
+
|
35
|
+
# v0.5.8
|
36
|
+
* Map additional directories into container for local yum cache
|
37
|
+
|
38
|
+
# v0.5.7
|
39
|
+
* Split puppet module from gem and rearrange repo
|
40
|
+
* Vendor jruby for offline
|
41
|
+
* Improved styling
|
42
|
+
|
43
|
+
# v0.5.6
|
44
|
+
* Parameterized the gitea plugin for all virtual courses
|
45
|
+
* Remove some non-student users from the user list
|
46
|
+
|
47
|
+
# v0.5.5
|
48
|
+
* Treeview plugin view
|
49
|
+
* Set UsePAM to 'yes' for ssh server
|
50
|
+
* Friendlier names for student environment groups
|
51
|
+
|
52
|
+
# v0.5.4
|
53
|
+
* gitea support
|
54
|
+
* Improved dashboard code
|
55
|
+
* Minor bugfixes
|
56
|
+
|
57
|
+
# v0.5.2
|
58
|
+
* Use full fqdn instead of just the hostname.
|
59
|
+
* Rescue puppetclassify errors.
|
60
|
+
|
61
|
+
# v0.5.1
|
62
|
+
* Sanitize user environment for CLI tools we use
|
63
|
+
* Don't create sources when running in a single control repo
|
64
|
+
|
65
|
+
# v0.5.0
|
66
|
+
Moved to using the code-staging directory for everything. Rather than editing
|
67
|
+
code live, this expects users to edit the code-staging directory and then
|
68
|
+
deploy via the button.
|
69
|
+
|
70
|
+
* Live puppet code-editing disabled.
|
71
|
+
* Use code-staging to edit code, and then push-button deploy!
|
72
|
+
* Improved 404 and 50x error pages
|
73
|
+
|
74
|
+
|
75
|
+
# v0.4.0
|
76
|
+
|
77
|
+
This is a major refactoring. It's marked as a Y release due to the internal
|
78
|
+
architecture changing so much, indicating a higher likelihood of errors. It
|
79
|
+
should not actually be a breaking change.
|
80
|
+
|
81
|
+
This adds the plugin system allowing us to reconfigure Puppetfactory for the
|
82
|
+
different ways we use it. It also adds a few new features, like a *Logs* tab
|
83
|
+
and the ability to manage code deployments directly from the UI.
|
84
|
+
|
85
|
+
This should simplify class setup drastically, as there's no more need for
|
86
|
+
creating user branches or webhook configuration.
|
87
|
+
|
88
|
+
This also marks the first **public release** of the tool, so yay!
|
@@ -14,6 +14,7 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
|
|
14
14
|
@controlrepo = options[:controlrepo]
|
15
15
|
@reponame = File.basename(@controlrepo, '.git')
|
16
16
|
@repopath = "#{@cache_dir}/#{@reponame}"
|
17
|
+
@gitea_upstream = options[:gitea_upstream] || "https://github.com/puppetlabs-education/#{@controlrepo}"
|
17
18
|
@gitea_cmd = options[:gitea_cmd] || '/home/git/go/bin/gitea'
|
18
19
|
@admin_username = options[:gitea_admin_username] || 'root'
|
19
20
|
@admin_password = options[:gitea_admin_password] || 'puppetlabs'
|
@@ -72,7 +73,7 @@ class Puppetfactory::Plugins::Gitea < Puppetfactory::Plugins
|
|
72
73
|
$logger.info "Migrating repository #{@reponame}"
|
73
74
|
begin
|
74
75
|
RestClient.post("http://#{@admin_username}:#{@admin_password}@localhost:#{@gitea_port}/api/v1/repos/migrate", {
|
75
|
-
'clone_addr' =>
|
76
|
+
'clone_addr' => @gitea_upstream,
|
76
77
|
'uid' => 1,
|
77
78
|
'repo_name' => @reponame,
|
78
79
|
})
|
data/public/css/style.css
CHANGED
@@ -47,6 +47,8 @@ code {
|
|
47
47
|
header {
|
48
48
|
height: 4em;
|
49
49
|
top: 0;
|
50
|
+
overflow-x: scroll;
|
51
|
+
white-space: nowrap;
|
50
52
|
}
|
51
53
|
|
52
54
|
header ul,
|
@@ -157,7 +159,7 @@ input.fail {
|
|
157
159
|
}
|
158
160
|
|
159
161
|
.tab.active {
|
160
|
-
background: #ECEFF1;
|
162
|
+
background: #ECEFF1;
|
161
163
|
}
|
162
164
|
|
163
165
|
.tab-content {
|
data/views/currentuser.erb
CHANGED
@@ -53,6 +53,7 @@
|
|
53
53
|
<% end -%>
|
54
54
|
<% if action_enabled? :deploy -%>
|
55
55
|
<input type="button" id="deploy" data-user="<%= @current[:username] %>" value="Deploy Environment">
|
56
|
+
<i class="fa"></i>
|
56
57
|
<% end -%>
|
57
58
|
<% end %>
|
58
59
|
|
@@ -62,4 +63,4 @@
|
|
62
63
|
$('#tree').jstree({ 'core': { 'data': <%= @current[:tree] %> } });
|
63
64
|
});
|
64
65
|
</script>
|
65
|
-
<% end %>
|
66
|
+
<% end %>
|
data/views/index.erb
CHANGED
@@ -19,9 +19,9 @@
|
|
19
19
|
<li><a href="#home" class="cache">Home</a></li>
|
20
20
|
<% if privileged? %>
|
21
21
|
<li><a href="/users">Users</a></li>
|
22
|
-
|
23
|
-
|
24
|
-
|
22
|
+
<% end %>
|
23
|
+
<% @tabs.each do |url, title| %>
|
24
|
+
<li><a href="/<%= url %>"><%= title %></a></li>
|
25
25
|
<% end %>
|
26
26
|
</ul>
|
27
27
|
<a href="http://<%= request.host %>:9090" target="_presentation">Presentation</a>
|
data/views/shell.erb
CHANGED
@@ -12,7 +12,7 @@
|
|
12
12
|
|
13
13
|
<% else %>
|
14
14
|
<h2>Welcome to the Puppet Classroom.</h2>
|
15
|
-
<p>Please log in or create a user account.</p>
|
15
|
+
<p>Please log in or create a user account.</p>
|
16
16
|
<% end -%>
|
17
17
|
<div id="instruction">
|
18
18
|
<p>
|
@@ -28,13 +28,13 @@
|
|
28
28
|
Built-in to Mac OSX and Linux:
|
29
29
|
<ol>
|
30
30
|
<li>Start Terminal.app or any terminal emulator to get to the command line</li>
|
31
|
-
<li>Run <code>ssh
|
31
|
+
<li>Run <code>ssh <% if @current %><%= @current[:username] %>@<% end %><%= request.host %></code></li>
|
32
32
|
</ol>
|
33
33
|
</li>
|
34
34
|
<li>
|
35
35
|
Windows:
|
36
36
|
<ul>
|
37
|
-
<li><a href="https://github.com/PowerShell/Win32-OpenSSH/wiki/Install-Win32-OpenSSH">OpenSSH</a></li>
|
37
|
+
<li><a href="https://github.com/PowerShell/Win32-OpenSSH/wiki/Install-Win32-OpenSSH">OpenSSH</a></li>
|
38
38
|
<li><a href="http://the.earth.li/~sgtatham/putty/latest/x86/putty.exe">PuTTY</a></li>
|
39
39
|
<li><a href="http://winscp.net/eng/download.php#download2" target="_new">WinSCP</a></li>
|
40
40
|
<li><a href="http://www.vandyke.com/download/securecrt/download.html" target="_new">SecureCRT</a></li>
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: puppetfactory
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ben Ford
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2018-01-
|
13
|
+
date: 2018-01-23 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: sinatra
|
@@ -137,6 +137,7 @@ executables:
|
|
137
137
|
extensions: []
|
138
138
|
extra_rdoc_files: []
|
139
139
|
files:
|
140
|
+
- CHANGELOG.md
|
140
141
|
- LICENSE
|
141
142
|
- README.md
|
142
143
|
- bin/pfsh
|