Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add scripts with server #339

Merged
merged 2 commits into from
Nov 1, 2019

Conversation

yakatz
Copy link
Member

@yakatz yakatz commented May 17, 2019

Pull Request (PR) description

This change allows packaging scripts with the server instance.

Example usage:

openvpn::server { 'test-site':
    ....
    up => '/etc/openvpn/test-site/scripts/add-tap-to-bridge.sh',
    scripts => {
        "add-tap-to-bridge.sh" => {content => 'a'},
    },
}

Anything that can go in a regular Puppet file resource can be used in the hash including template, source, and content.

up, down, client-connect and client-disconnect scripts will be checked for / and be considered to be in the scripts folder otherwise.

Tests pass locally.

@yakatz yakatz changed the title Add scripts with server WIP: Add scripts with server May 17, 2019
@yakatz yakatz changed the title WIP: Add scripts with server Add scripts with server May 20, 2019
@yakatz
Copy link
Member Author

yakatz commented May 20, 2019

Build failure looks like an infrastructure issue, not test issue

@Dan33l
Copy link
Member

Dan33l commented May 21, 2019

Build failure looks like an infrastructure issue, not test issue

I restarted the job.

@bastelfreak
Copy link
Member

@yakatz please have a look at the inline comments I made. Can you also document this feature in the README.md?

@bastelfreak bastelfreak added enhancement New feature or request needs-docs needs-work not ready to merge just yet labels May 26, 2019
@bastelfreak
Copy link
Member

Ping @yakatz

@yakatz
Copy link
Member Author

yakatz commented Jul 19, 2019

For some reason I didn't get notifications from GitHub about this. I will work on it over the next few days.

@yakatz yakatz force-pushed the feature/package-scripts branch 4 times, most recently from b73dad4 to 89fbf20 Compare August 2, 2019 00:40
@pccibot
Copy link

pccibot commented Oct 23, 2019

Dear @yakatz, thanks for the PR!

This is pccibot, your friendly Vox Pupuli GitHub Bot. I noticed that your pull request contains merge conflict. Can you please rebase?

You can find my sourcecode at voxpupuli/vox-pupuli-tasks

@yakatz yakatz force-pushed the feature/package-scripts branch from 8fef45d to 61fefeb Compare October 23, 2019 19:04
@yakatz
Copy link
Member Author

yakatz commented Oct 23, 2019

Looks like a test timeout again. Is this something I am doing wrong or is it just a test system issue?

@yakatz yakatz requested a review from bastelfreak October 23, 2019 19:44
@yakatz
Copy link
Member Author

yakatz commented Oct 29, 2019

Once again, test failures look to me to be infrastructure issues. There is nothing changed in the last commit that would change the outcome of these tests.

@Dan33l
Copy link
Member

Dan33l commented Oct 29, 2019

Once again, test failures look to me to be infrastructure issues. There is nothing changed in the last commit that would change the outcome of these tests.

On failing configuration, the vpnserver system under test does not see the vpn client.
On working configuration:
https://travis-ci.org/voxpupuli/puppet-openvpn/jobs/604083503#L2210
On failing configuration
https://travis-ci.org/voxpupuli/puppet-openvpn/jobs/604083491#L2134

Right now i am unable to say more.

@yakatz yakatz requested a review from bastelfreak October 30, 2019 18:41
@yakatz yakatz requested a review from bastelfreak October 31, 2019 03:46
@bastelfreak
Copy link
Member

@yakatz the code looks good to me. Are you able to squash the commits down to a few?

@yakatz yakatz force-pushed the feature/package-scripts branch from f52a190 to abec515 Compare November 1, 2019 05:23
yakatz and others added 2 commits November 1, 2019 01:25
Add tests

Co-Authored-By: Tim Meusel <[email protected]>
Script paths are automatically prepended

`REFERENCE.md` updated using `puppet strings generate --format markdown`. This adds some documentation for other missing items.
@yakatz yakatz force-pushed the feature/package-scripts branch from abec515 to d97033a Compare November 1, 2019 05:26
@yakatz
Copy link
Member Author

yakatz commented Nov 1, 2019

@bastelfreak Squashed to 2

@bastelfreak bastelfreak removed needs-docs needs-work not ready to merge just yet labels Nov 1, 2019
@bastelfreak bastelfreak merged commit fb1f4b3 into voxpupuli:master Nov 1, 2019
@yakatz yakatz deleted the feature/package-scripts branch November 6, 2019 22:21
@yakatz
Copy link
Member Author

yakatz commented Nov 7, 2019

@bastelfreak Any thought on when this could make it into a release?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants