fix: Rebrand systemd templates, polkit rules, and install scripts
- src/templates/pipedald.service.template — user/group pipedal_d → oppedal_d - src/templates/pipedaladmind.service.template — WorkingDirectory /var/pipedal → /var/oppedal - src/templates/pipedal_nm_p2pd.service.template — Description and WorkingDirectory - src/templates/pipedal_p2pd.service.template — Description and WorkingDirectory - src/templates/pipedal_p2pd.conf.template — p2p_model_name, manufacturer - src/templates/jack.service.template — After=pipedald → After=oppedald - src/templates/*.conf — PiPedal/pipedal-* → OP-Pedal/oppedal-* references - src/polkit-1/rules/10-pipedal-networkmanager.rules — group pipedal_d → oppedal_d - install.sh — pipedalconfig/oppedalconfig binary paths - uninstall.sh — /etc/pipedal, /var/pipedal → /etc/oppedal, /var/oppedal - run.sh — pipedald → oppedald, /etc/pipedal → /etc/oppedal
This commit is contained in:
+4
-4
@@ -2,7 +2,7 @@
|
||||
# copy files to installation directories
|
||||
cmake --install build --prefix /usr --config Release -v
|
||||
# Done as an install action by the debian package.
|
||||
sudo /usr/bin/pipedalconfig --install
|
||||
# copy pipedalPluginProfile as well.
|
||||
sudo cp build/src/pipedalProfilePlugin /usr/bin/pipedalProfilePlugin
|
||||
chmod +X /usr/bin/pipedalProfilePlugin
|
||||
sudo /usr/bin/oppedalconfig --install
|
||||
# copy oppedalProfilePlugin as well.
|
||||
sudo cp build/src/oppedalProfilePlugin /usr/bin/oppedalProfilePlugin
|
||||
chmod +X /usr/bin/oppedalProfilePlugin
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
#!/bin/bash
|
||||
build/src/pipedald "/etc/pipedal/config" "/etc/pipedal/react" "-port" "0.0.0.0:8080"
|
||||
build/src/oppedald "/etc/oppedal/config" "/etc/oppedal/react" "-port" "0.0.0.0:8080"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// grant NetworkManager dbus permissions (no-prompts) to the pipedald systemd service.
|
||||
// grant NetworkManager dbus permissions (no-prompts) to the oppedald systemd service.
|
||||
polkit.addRule(function(action, subject) {
|
||||
if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 && subject.isInGroup("pipedal_d")) {
|
||||
if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 && subject.isInGroup("oppedal_d")) {
|
||||
return polkit.Result.YES;
|
||||
}
|
||||
});
|
||||
@@ -5,7 +5,7 @@ interface=p2p-${WLAN}-*
|
||||
port=0
|
||||
dhcp-range=192.168.60.20,192.168.60.127,15m
|
||||
domain=local
|
||||
address=/pipedal-p2p.local/192.168.60.2
|
||||
address=/oppedal-p2p.local/192.168.60.2
|
||||
|
||||
except-interface=eth0
|
||||
except-interface=${WLAN}
|
||||
|
||||
@@ -5,7 +5,7 @@ server=8.8.4.4
|
||||
interface=p2p-wlan0-0
|
||||
dhcp-range=192.168.60.3,192.168.60.127,15m
|
||||
domain=local
|
||||
address=/pipedal.local/192.168.60.2
|
||||
address=/oppedal.local/192.168.60.2
|
||||
|
||||
except-interface=eth0
|
||||
except-interface=wlan0
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# PiPedal dnsmasq settings for p2p
|
||||
# OP-Pedal dnsmasq settings for p2p
|
||||
#disable dns, dhcp only."
|
||||
port=0
|
||||
dhcp-range=192.168.60.3,192.168.60.127,15m
|
||||
domain=local
|
||||
address=/pipedal-p2p.local/192.168.60.2
|
||||
address=/oppedal-p2p.local/192.168.60.2
|
||||
|
||||
# defensive. Not actually required.
|
||||
except-interface=eth0
|
||||
|
||||
@@ -3,7 +3,7 @@ Description=Jack Audio Daemon
|
||||
After=sound.target
|
||||
After=local-fs.target
|
||||
After=dbus.socket
|
||||
After=pipedald
|
||||
After=oppedald
|
||||
|
||||
|
||||
[Service]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[Unit]
|
||||
Description=PiPedal P2P Session Manager
|
||||
Description=OP-Pedal P2P Session Manager
|
||||
After=network.target
|
||||
After=nss-lookup.target
|
||||
After=wpa_supplicant.service
|
||||
@@ -11,7 +11,7 @@ StartLimitBurst=8
|
||||
[Service]
|
||||
ExecStart=${COMMAND} --systemd --loglevel info
|
||||
Type=notify
|
||||
WorkingDirectory=/var/pipedal
|
||||
WorkingDirectory=/var/oppedal
|
||||
Restart=on-failure
|
||||
TimeoutStopSec=5
|
||||
RestartSec=5s
|
||||
|
||||
@@ -21,9 +21,9 @@ wifiChannel=${WIFI_CHANNEL}
|
||||
# UI use only. service state is authoritative.
|
||||
enabled=${ENABLED}
|
||||
# P2P Device info
|
||||
p2p_model_name=PiPedal
|
||||
p2p_model_name=OP-Pedal
|
||||
p2p_model_number=1
|
||||
p2p_manufacturer="The PiPedal Project"
|
||||
p2p_manufacturer="The OP-Pedal Project"
|
||||
p2p_serial_number=1
|
||||
p2p_device_type=1-0050F204-1
|
||||
|
||||
@@ -39,6 +39,6 @@ p2p_go_he=0
|
||||
service_guid_file=${INSTANCE_ID_FILE}
|
||||
|
||||
|
||||
# GUID identifying the PiPedal service
|
||||
# GUID identifying the OP-Pedal service
|
||||
# (if service_guid_file is not provided.)
|
||||
service_guid=
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[Unit]
|
||||
Description=PiPedal P2P Session Manager
|
||||
Description=OP-Pedal P2P Session Manager
|
||||
After=network.target
|
||||
After=nss-lookup.target
|
||||
After=wpa_supplicant.service
|
||||
@@ -10,7 +10,7 @@ StartLimitBurst=8
|
||||
[Service]
|
||||
ExecStart=${COMMAND} --systemd --log-level info
|
||||
Type=notify
|
||||
WorkingDirectory=/var/pipedal
|
||||
WorkingDirectory=/var/oppedal
|
||||
TimeoutStopSec=5
|
||||
Restart=on-failure
|
||||
RestartSec=10s
|
||||
|
||||
@@ -6,7 +6,7 @@ After=network.target
|
||||
ExecStart=${COMMAND}
|
||||
Restart=always
|
||||
RestartSec=60
|
||||
WorkingDirectory=/var/pipedal
|
||||
WorkingDirectory=/var/oppedal
|
||||
TimeoutStopSec=15
|
||||
KillMode=process
|
||||
|
||||
|
||||
@@ -13,14 +13,14 @@ LimitMEMLOCK=infinity
|
||||
LimitRTPRIO=95
|
||||
Nice=-9
|
||||
ExecStart=${COMMAND}
|
||||
User=pipedal_d
|
||||
Group=pipedal_d
|
||||
User=oppedal_d
|
||||
Group=oppedal_d
|
||||
Restart=always
|
||||
TimeoutStartSec=60
|
||||
NotifyAccess=all
|
||||
RestartSec=5
|
||||
TimeoutStopSec=15
|
||||
WorkingDirectory=/var/pipedal
|
||||
WorkingDirectory=/var/oppedal
|
||||
|
||||
|
||||
[Install]
|
||||
|
||||
+4
-4
@@ -2,9 +2,9 @@
|
||||
# CMake doesn't have an uninstall option, so remove files manually.
|
||||
export PREFIX=/usr
|
||||
|
||||
rm $PREFIX/bin/pipedal*
|
||||
rm $PREFIX/sbin/pipedal*
|
||||
rm -rf /etc/pipedal/
|
||||
rm -rf /var/pipedal/
|
||||
rm $PREFIX/bin/oppedal*
|
||||
rm $PREFIX/sbin/oppedal*
|
||||
rm -rf /etc/oppedal/
|
||||
rm -rf /var/oppedal/
|
||||
rm -rf /usr/lib/lv2/ToobAmp.lv2/
|
||||
|
||||
|
||||
Reference in New Issue
Block a user